diff -urN linux-2.6.12_lsp.1.10.3/Makefile linux-2.6.12_lsp.1.10.3.self/Makefile --- linux-2.6.12_lsp.1.10.3/Makefile 2007-01-16 14:39:05.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/Makefile 2007-03-10 16:50:16.299441000 +0900 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 12 -EXTRAVERSION = .6-arm1 +EXTRAVERSION = .6-mda1 NAME=Woozy Numbat # *DOCUMENTATION* @@ -192,7 +192,7 @@ ARCH ?= arm #CROSS_COMPILE ?= arm-linux- -CROSS_COMPILE=arm-none-linux-gnueabi- +#CROSS_COMPILE=arm-none-linux-gnueabi- # Architecture as present in compile.h UTS_MACHINE := $(ARCH) @@ -557,7 +557,7 @@ # relocations required by build roots. This is not defined in the # makefile but the arguement can be passed to make if needed. # -INSTALL_MOD_PATH=binaries +INSTALL_MOD_PATH= MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) export MODLIB diff -urN linux-2.6.12_lsp.1.10.3/arch/arm/kernel/setup.c linux-2.6.12_lsp.1.10.3.self/arch/arm/kernel/setup.c --- linux-2.6.12_lsp.1.10.3/arch/arm/kernel/setup.c 2005-08-30 01:55:27.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/arch/arm/kernel/setup.c 2007-03-13 16:03:35.598214000 +0900 @@ -98,7 +98,7 @@ unsigned long phys_initrd_start __initdata = 0; unsigned long phys_initrd_size __initdata = 0; -static struct meminfo meminfo __initdata = { 0, }; +// struct meminfo meminfo __initdata = { 0, }; static const char *cpu_name; static const char *machine_name; static char command_line[COMMAND_LINE_SIZE]; diff -urN linux-2.6.12_lsp.1.10.3/arch/arm/mm/init.c linux-2.6.12_lsp.1.10.3.self/arch/arm/mm/init.c --- linux-2.6.12_lsp.1.10.3/arch/arm/mm/init.c 2005-08-30 01:55:27.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/arch/arm/mm/init.c 2007-03-13 16:04:18.968214000 +0900 @@ -39,7 +39,7 @@ * The sole use of this is to pass memory configuration * data from paging_init to mem_init. */ -static struct meminfo meminfo __initdata = { 0, }; +struct meminfo meminfo __initdata = { 0, }; /* * empty_zero_page is a special page that is used for diff -urN linux-2.6.12_lsp.1.10.3/drivers/char/vc_screen.c linux-2.6.12_lsp.1.10.3.self/drivers/char/vc_screen.c --- linux-2.6.12_lsp.1.10.3/drivers/char/vc_screen.c 2005-08-30 01:55:27.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/drivers/char/vc_screen.c 2007-03-13 14:41:43.538214000 +0900 @@ -419,7 +419,7 @@ while (this_round > 1) { unsigned short w; - w = get_unaligned(((const unsigned short *)con_buf0)); + w = get_unaligned(((unsigned short *)con_buf0)); vcs_scr_writew(vc, w, org++); con_buf0 += 2; this_round -= 2; diff -urN linux-2.6.12_lsp.1.10.3/include/asm-arm/bug.h linux-2.6.12_lsp.1.10.3.self/include/asm-arm/bug.h --- linux-2.6.12_lsp.1.10.3/include/asm-arm/bug.h 2005-08-30 01:55:27.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/include/asm-arm/bug.h 2007-03-13 14:36:03.058214000 +0900 @@ -5,7 +5,7 @@ #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE -extern volatile void __bug(const char *file, int line, void *data); +extern void __bug(const char *file, int line, void *data); /* give file/line information */ #define BUG() __bug(__FILE__, __LINE__, NULL) diff -urN linux-2.6.12_lsp.1.10.3/include/asm-arm/cpu-single.h linux-2.6.12_lsp.1.10.3.self/include/asm-arm/cpu-single.h --- linux-2.6.12_lsp.1.10.3/include/asm-arm/cpu-single.h 2005-08-30 01:55:27.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/include/asm-arm/cpu-single.h 2007-03-13 14:36:31.298214000 +0900 @@ -41,4 +41,4 @@ extern void cpu_dcache_clean_area(void *, int); extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm); extern void cpu_set_pte(pte_t *ptep, pte_t pte); -extern volatile void cpu_reset(unsigned long addr); +extern void cpu_reset(unsigned long addr); diff -urN linux-2.6.12_lsp.1.10.3/include/asm-arm/uaccess.h linux-2.6.12_lsp.1.10.3.self/include/asm-arm/uaccess.h --- linux-2.6.12_lsp.1.10.3/include/asm-arm/uaccess.h 2006-08-30 21:21:40.000000000 +0900 +++ linux-2.6.12_lsp.1.10.3.self/include/asm-arm/uaccess.h 2007-03-13 13:57:22.678214000 +0900 @@ -120,7 +120,7 @@ #define get_user(x,p) \ ({ \ const register typeof(*(p)) __user *__p asm("r0") = (p);\ - register typeof(*(p)) __r2 asm("r2"); \ + register unsigned int __r2 asm("r2"); \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \ case 1: \ @@ -132,12 +132,9 @@ case 4: \ __get_user_x(__r2, __p, __e, 4, "lr"); \ break; \ - case 8: \ - __get_user_x(__r2, __p, __e, 8, "lr"); \ - break; \ default: __e = __get_user_bad(); break; \ } \ - x = __r2; \ + x = (typeof(*(p))) __r2; \ __e; \ })