Re: Another compile problem with 2.6.15.5 on AMD64

[Jesper Juhl <jesper.juhl@gmail.com>]

On Thursday 02 March 2006 19:07, Steffen Weber wrote:
> Jesper Juhl wrote:
> > On Thursday 02 March 2006 18:49, Steffen Weber wrote:
> >> Jesper Juhl wrote:
> >>> On 3/2/06, Steffen Weber <email@steffenweber.net> wrote:
> >>>> Jesper Juhl wrote:
> >>>>> On Thursday 02 March 2006 17:18, Steffen Weber wrote:
> >>>>>> I´m getting a compile error with 2.6.15.5 on x86_64 using GCC 3.4.4
> >>>>>> (does not seem to be related to the NFS one):
> >>>>>>
> >>>>>>    CC      mm/mempolicy.o
> >>>>>> mm/mempolicy.c: In function `get_nodes':
> >>>>>> mm/mempolicy.c:527: error: `BITS_PER_BYTE' undeclared (first use in
> >>>>>> this function)
> >>>>>> mm/mempolicy.c:527: error: (Each undeclared identifier is reported only
> >>>>>> once
> >>>>>> mm/mempolicy.c:527: error: for each function it appears in.)
> >>>>>>
[snip]
> > 
> > Try this patch instead : 
> This patch solves the problem! :-) I have not yet rebooted the machine 
> (it´s a busy webserver), but in case I do not reply again within one day 
> you can assume that it works fine. Thank you very much!
> 

Thank you for the feedback.

Andi, Christoph : would this make sense as a fix for -stable ?
How about mainline ?


Fix build error in mm/mempolicy.c due to missing `BITS_PER_BYTE'.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
---

 arch/i386/mach-voyager/voyager_cat.c |    1 -
 include/linux/types.h                |    2 ++
 mm/mempolicy.c                       |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

--- linux-2.6.15.5/mm/mempolicy.c~	2006-03-02 18:05:18.000000000 +0100
+++ linux-2.6.15.5/mm/mempolicy.c	2006-03-02 18:05:18.000000000 +0100
@@ -82,7 +82,7 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/compat.h>
-#include <linux/mempolicy.h>
+#include <linux/types.h>
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
 
--- linux-2.6.15.5/arch/i386/mach-voyager/voyager_cat.c~	2006-03-02 18:55:47.000000000 +0100
+++ linux-2.6.15.5/arch/i386/mach-voyager/voyager_cat.c	2006-03-02 18:55:47.000000000 +0100
@@ -114,7 +114,6 @@ static struct resource qic_res = {
  * It writes num_bits of the data buffer in msg starting at start_bit.
  * Note: This function assumes that any unused bit in the data stream
  * is set to zero so that the ors will work correctly */
-#define BITS_PER_BYTE 8
 static void
 cat_pack(__u8 *msg, const __u16 start_bit, __u8 *data, const __u16 num_bits)
 {
--- linux-2.6.15.5/include/linux/types.h~	2006-03-02 18:54:57.000000000 +0100
+++ linux-2.6.15.5/include/linux/types.h	2006-03-02 18:54:57.000000000 +0100
@@ -8,6 +8,8 @@
 	(((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
 #define DECLARE_BITMAP(name,bits) \
 	unsigned long name[BITS_TO_LONGS(bits)]
+
+#define BITS_PER_BYTE 8
 #endif
 
 #include <linux/posix_types.h>