- remove last vestiges of lkcd patch (kexec functionality subsumed by

  kexec patch applied by alk, the rest of it never worked anyway)

diff --git a/mm/bootmem.c b/mm/bootmem.c
index b2225a8..424efee 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -27,7 +27,6 @@
  */
 unsigned long max_low_pfn;
 unsigned long min_low_pfn;
-EXPORT_SYMBOL(min_low_pfn);
 unsigned long max_pfn;
 /*
  * If we have booted due to a crash, max_pfn will be a very low value. We need

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 36573f7..1fa79c4 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -65,11 +65,6 @@ int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = { 256, 32 };
 EXPORT_SYMBOL(totalram_pages);
 EXPORT_SYMBOL(nr_swap_pages);
 
-#ifdef CONFIG_CRASH_DUMP
-/* This symbol has to be exported to use 'for_each_pgdat' macro by modules. */
-EXPORT_SYMBOL(pgdat_list);
-#endif
-
 /*
  * Used by page_zone() to look up the address of the struct zone whose
  * id is encoded in the upper bits of page->flags
@@ -124,7 +119,7 @@ static void bad_page(const char *function, struct page *page)
        tainted |= TAINT_BAD_PAGE;
 }
 
-#if !defined(CONFIG_HUGETLB_PAGE) && !defined(CONFIG_CRASH_DUMP)
+#ifndef CONFIG_HUGETLB_PAGE
 #define prep_compound_page(page, order) do { } while (0)
 #define destroy_compound_page(page, order) do { } while (0)
 #else

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index 5623e19..5851318 100644 (file)
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -290,7 +290,6 @@ BuildKernel() {
         grep "__crc_$i\$" System.map >> $RPM_BUILD_ROOT/boot/System.map-$KernelVer ||:
     done
     rm -f exported
-#    install -m 644 init/kerntypes.o $RPM_BUILD_ROOT/boot/Kerntypes-$KernelVer
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     rm -f System.map
     cp arch/*/boot/bzImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
@@ -472,7 +471,6 @@ fi
 # make some useful links
 pushd /boot > /dev/null ; {
        ln -sf System.map-%{KVERREL} System.map
-#      ln -sf Kerntypes-%{KVERREL} Kerntypes
        ln -sf config-%{KVERREL} config
        ln -sf initrd-%{KVERREL}.img initrd-boot
        ln -sf vmlinuz-%{KVERREL} kernel-boot
@@ -525,7 +523,6 @@ fi
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}
-#/boot/Kerntypes-%{KVERREL}
 /boot/System.map-%{KVERREL}
 /boot/config-%{KVERREL}
 %dir /lib/modules/%{KVERREL}
@@ -538,7 +535,6 @@ fi
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}smp
-#/boot/Kerntypes-%{KVERREL}smp
 /boot/System.map-%{KVERREL}smp
 /boot/config-%{KVERREL}smp
 %dir /lib/modules/%{KVERREL}smp
@@ -551,7 +547,6 @@ fi
 %files xenU
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}xenU
-#/boot/Kerntypes-%{KVERREL}xenU
 /boot/System.map-%{KVERREL}xenU
 /boot/config-%{KVERREL}xenU
 %dir /lib/modules/%{KVERREL}xenU

diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 1357c29..019ee96 100755 (executable)
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -33,7 +33,7 @@ UTS_VERSION="$UTS_VERSION `LC_ALL=C LANG=C date`"
 
 UTS_LEN=64
 UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
-LINUX_COMPILE_VERSION_ID="__linux_compile_version_id__`hostname | tr -c '[0-9A-Za-z\n]' '__'`_`LANG=C date | tr -c '[0-9A-Za-z\n]' '_'`"
+
 # Generate a temporary compile.h
 
 ( echo /\* This file is auto generated, version $VERSION \*/
@@ -55,8 +55,6 @@ LINUX_COMPILE_VERSION_ID="__linux_compile_version_id__`hostname | tr -c '[0-9A-Z
   fi
 
   echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
-  echo \#define LINUX_COMPILE_VERSION_ID $LINUX_COMPILE_VERSION_ID
-  echo \#define LINUX_COMPILE_VERSION_ID_TYPE typedef char* "$LINUX_COMPILE_VERSION_ID""_t"
 ) > .tmpcompile
 
 # Only replace the real compile.h if the new one is different,