linux-2.6-suspend2-page.patch

   1 diff -ur linux-2.6.16.14/arch/alpha/kernel/setup.c linux-2.6.16.14.susp2/arch/alpha/kernel/setup.c
   2 --- linux-2.6.16.14/arch/alpha/kernel/setup.c   2006-05-05 02:03:45.000000000 +0200
   3 +++ linux-2.6.16.14.susp2/arch/alpha/kernel/setup.c     2006-05-06 00:20:36.000000000 +0200
   4 @@ -453,7 +453,7 @@
   5  extern void setup_memory(void *);
   6  #endif /* !CONFIG_DISCONTIGMEM */
   7
   8 -int __init
   9 +int
  10  page_is_ram(unsigned long pfn)
  11  {
  12         struct memclust_struct * cluster;
  13 diff -ur linux-2.6.16.14/arch/alpha/mm/init.c linux-2.6.16.14.susp2/arch/alpha/mm/init.c
  14 --- linux-2.6.16.14/arch/alpha/mm/init.c        2006-05-05 16:35:37.000000000 +0200
  15 +++ linux-2.6.16.14.susp2/arch/alpha/mm/init.c  2006-05-06 00:21:11.000000000 +0200
  16 @@ -315,7 +315,7 @@
  17  printk_memory_info(void)
  18  {
  19         unsigned long codesize, reservedpages, datasize, initsize, tmp;
  20 -       extern int page_is_ram(unsigned long) __init;
  21 +       extern int page_is_ram(unsigned long);
  22         extern char _text, _etext, _data, _edata;
  23         extern char __init_begin, __init_end;
  24
  25 diff -ur linux-2.6.16.14/arch/alpha/mm/numa.c linux-2.6.16.14.susp2/arch/alpha/mm/numa.c
  26 --- linux-2.6.16.14/arch/alpha/mm/numa.c        2006-05-05 02:03:45.000000000 +0200
  27 +++ linux-2.6.16.14.susp2/arch/alpha/mm/numa.c  2006-05-06 00:21:19.000000000 +0200
  28 @@ -323,7 +323,7 @@
  29  void __init mem_init(void)
  30  {
  31         unsigned long codesize, reservedpages, datasize, initsize, pfn;
  32 -       extern int page_is_ram(unsigned long) __init;
  33 +       extern int page_is_ram(unsigned long);
  34         extern char _text, _etext, _data, _edata;
  35         extern char __init_begin, __init_end;
  36         unsigned long nid, i;
  37 diff -ur linux-2.6.16.14/arch/sparc/mm/init.c linux-2.6.16.14.susp2/arch/sparc/mm/init.c
  38 --- linux-2.6.16.14/arch/sparc/mm/init.c        2006-05-05 02:03:45.000000000 +0200
  39 +++ linux-2.6.16.14.susp2/arch/sparc/mm/init.c  2006-05-06 00:23:20.000000000 +0200
  40 @@ -469,6 +469,11 @@
  41                totalhigh_pages << (PAGE_SHIFT-10));
  42  }
  43
  44 +int page_is_ram(int pfn)
  45 +{
  46 +       return pfn_valid(pfn);
  47 +}
  48 +
  49  void free_initmem (void)
  50  {
  51         unsigned long addr;
  52 diff -ur linux-2.6.16.14/arch/sparc64/mm/init.c linux-2.6.16.14.susp2/arch/sparc64/mm/init.c
  53 --- linux-2.6.16.14/arch/sparc64/mm/init.c      2006-05-05 02:03:45.000000000 +0200
  54 +++ linux-2.6.16.14.susp2/arch/sparc64/mm/init.c        2006-05-06 00:23:59.000000000 +0200
  55 @@ -1633,6 +1633,11 @@
  56                 cheetah_ecache_flush_init();
  57  }
  58
  59 +int page_is_ram(unsigned long pfn)
  60 +{
  61 +       return pfn_valid(pfn);
  62 +}
  63 +
  64  void free_initmem(void)
  65  {
  66         unsigned long addr, initend;
  67 diff -ur linux-2.6.16.14/include/asm-alpha/page.h linux-2.6.16.14.susp2/include/asm-alpha/page.h
  68 --- linux-2.6.16.14/include/asm-alpha/page.h    2006-05-05 02:03:45.000000000 +0200
  69 +++ linux-2.6.16.14.susp2/include/asm-alpha/page.h      2006-05-06 00:27:23.000000000 +0200
  70 @@ -43,6 +43,8 @@
  71  #define __pgd(x)       ((pgd_t) { (x) } )
  72  #define __pgprot(x)    ((pgprot_t) { (x) } )
  73
  74 +extern int page_is_ram(unsigned long pfn);
  75 +
  76  #else
  77  /*
  78   * .. while these make it easier on the compiler
  79 diff -ur linux-2.6.16.14/include/asm-sparc/page.h linux-2.6.16.14.susp2/include/asm-sparc/page.h
  80 --- linux-2.6.16.14/include/asm-sparc/page.h    2006-05-05 02:03:45.000000000 +0200
  81 +++ linux-2.6.16.14.susp2/include/asm-sparc/page.h      2006-05-06 00:28:11.000000000 +0200
  82 @@ -64,6 +64,8 @@
  83
  84  extern struct cache_palias *sparc_aliases;
  85
  86 +extern int page_is_ram(int pfn);
  87 +
  88  /* passing structs on the Sparc slow us down tremendously... */
  89
  90  /* #define STRICT_MM_TYPECHECKS */
  91 diff -ur linux-2.6.16.14/include/asm-sparc64/page.h linux-2.6.16.14.susp2/include/asm-sparc64/page.h
  92 --- linux-2.6.16.14/include/asm-sparc64/page.h  2006-05-05 02:03:45.000000000 +0200
  93 +++ linux-2.6.16.14.susp2/include/asm-sparc64/page.h    2006-05-06 00:28:24.000000000 +0200
  94 @@ -39,6 +39,8 @@
  95  #define copy_page(X,Y) memcpy((void *)(X), (void *)(Y), PAGE_SIZE)
  96  extern void copy_user_page(void *to, void *from, unsigned long vaddr, struct page *topage);
  97
  98 +extern int page_is_ram(unsigned long pfn);
  99 +
 100  /* Unlike sparc32, sparc64's parameter passing API is more
 101   * sane in that structures which as small enough are passed
 102   * in registers instead of on the stack.  Thus, setting