lustre/kernel_patches/patches/uml-vanilla-2.6.6-p2.patch

   1 --- linux-2.6.6/arch/um/kernel/physmem.c.saved  2004-05-11 19:24:53.000000000 +0200
   2 +++ linux-2.6.6/arch/um/kernel/physmem.c        2004-05-11 19:25:16.000000000 +0200
   3 @@ -285,7 +285,7 @@
   4                 p = &map[i];
   5                 set_page_count(p, 0);
   6                 SetPageReserved(p);
   7 -               INIT_LIST_HEAD(&p->list);
   8 +               INIT_LIST_HEAD(&p->lru);
   9         }
  10
  11         mem_map = map;
  12 --- linux-2.6.6/arch/um/kernel/sysrq.c.saved    2004-05-11 17:52:41.000000000 +0200
  13 +++ linux-2.6.6/arch/um/kernel/sysrq.c  2004-05-11 19:55:36.000000000 +0200
  14 @@ -46,10 +46,7 @@
  15
  16  void show_stack(struct task_struct *task, unsigned long *sp)
  17  {
  18 -       if(task)
  19 -               show_trace_task(task);
  20 -       else
  21 -               show_trace(sp);
  22 +       show_trace(sp);
  23  }
  24
  25  /*
  26 --- linux-2.6.6/arch/um/dyn.lds.S.saved 2004-05-11 17:52:40.000000000 +0200
  27 +++ linux-2.6.6/arch/um/dyn.lds.S       2004-05-11 20:18:36.000000000 +0200
  28 @@ -1,3 +1,5 @@
  29 +#include <asm-generic/vmlinux.lds.h>
  30 +
  31  OUTPUT_FORMAT(ELF_FORMAT)
  32  OUTPUT_ARCH(ELF_ARCH)
  33  ENTRY(_start)
  34 @@ -58,7 +60,9 @@
  35    } =0x90909090
  36    .plt            : { *(.plt) }
  37    .text           : {
  38 -    *(.text .stub .text.* .gnu.linkonce.t.*)
  39 +    *(.text)
  40 +    SCHED_TEXT
  41 +    *(.stub .text.* .gnu.linkonce.t.*)
  42      /* .gnu.warning sections are handled specially by elf32.em.  */
  43      *(.gnu.warning)
  44    } =0x90909090
  45 --- linux-2.6.6/arch/um/uml.lds.S.saved 2004-05-11 17:52:42.000000000 +0200
  46 +++ linux-2.6.6/arch/um/uml.lds.S       2004-05-11 20:03:10.000000000 +0200
  47 @@ -34,6 +34,7 @@
  48    .text      :
  49    {
  50      *(.text)
  51 +    SCHED_TEXT
  52      /* .gnu.warning sections are handled specially by elf32.em.  */
  53      *(.gnu.warning)
  54      *(.gnu.linkonce.t*)
  55 --- linux-2.6.6/Makefile.saved  2004-05-11 19:20:02.000000000 +0200
  56 +++ linux-2.6.6/Makefile        2004-05-11 19:20:59.000000000 +0200
  57 @@ -449,6 +449,10 @@
  58
  59  include $(srctree)/arch/$(ARCH)/Makefile
  60
  61 +# Let architecture Makefiles change CPPFLAGS if needed
  62 +CFLAGS := $(CPPFLAGS) $(CFLAGS)
  63 +AFLAGS := $(CPPFLAGS) $(AFLAGS)
  64 +
  65  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
  66  CFLAGS         += -Os
  67  else
  68 --- linux/include/asm-um/system-i386.h  2004-02-04 04:43:42.000000000 +0100
  69 +++ uml/linux/include/asm-um/system-i386.h      2004-04-08 00:18:09.621333000 +0200
  70 @@ -2,36 +2,5 @@
  71  #define __UM_SYSTEM_I386_H
  72
  73  #include "asm/system-generic.h"
  74 -
  75 -static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
  76 -                                     unsigned long new, int size)
  77 -{
  78 -       unsigned long prev;
  79 -       switch (size) {
  80 -       case 1:
  81 -               __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2"
  82 -                                    : "=a"(prev)
  83 -                                    : "q"(new), "m"(*__xg(ptr)), "0"(old)
  84 -                                    : "memory");
  85 -               return prev;
  86 -       case 2:
  87 -               __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
  88 -                                    : "=a"(prev)
  89 -                                    : "q"(new), "m"(*__xg(ptr)), "0"(old)
  90 -                                    : "memory");
  91 -               return prev;
  92 -       case 4:
  93 -               __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
  94 -                                    : "=a"(prev)
  95 -                                    : "q"(new), "m"(*__xg(ptr)), "0"(old)
  96 -                                    : "memory");
  97 -               return prev;
  98 -       }
  99 -       return old;
 100 -}
 101 -
 102 -#define cmpxchg(ptr,o,n)\
 103 -       ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
 104 -                                       (unsigned long)(n),sizeof(*(ptr))))
 105
 106  #endif
 107 --- linux/arch/um/Makefile-i386 2004-04-08 00:27:50.031333000 +0200
 108 +++ uml/linux/arch/um/Makefile-i386     2004-04-07 23:22:31.000000000 +0200
 109 @@ -30,7 +30,7 @@
 110  $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread
 111         $(call filechk,$@)
 112
 113 -$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ;
 114 +$(SYS_UTIL_DIR)/mk_sc: scripts/basic/fixdep include/config/MARKER FORCE ;
 115         $(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
 116
 117  $(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ;