diff -ruN linux-2.4.20_hglan_htgl/arch/ppc/kernel/setup.c linux-2.4.20_kurobox/arch/ppc/kernel/setup.c --- linux-2.4.20_hglan_htgl/arch/ppc/kernel/setup.c 2005-03-22 01:08:36.000000000 -0500 +++ linux-2.4.20_kurobox/arch/ppc/kernel/setup.c 2005-08-06 01:24:47.477404400 -0400 @@ -263,7 +263,7 @@ unsigned long early_init(int r3, int r4, int r5) { - extern char __bss_start, _end; + extern char __bss_start[], _end[]; unsigned long phys; unsigned long offset = reloc_offset(); @@ -272,7 +272,7 @@ /* First zero the BSS -- use memset, some arches don't have * caches on yet */ - memset_io(PTRRELOC(&__bss_start), 0, &_end - &__bss_start); + memset_io(PTRRELOC(&__bss_start), 0, _end - __bss_start); /* * Identify the CPU type and fix up code sections diff -ruN linux-2.4.20_hglan_htgl/arch/ppc/platforms/linkstation/5c372.c linux-2.4.20_kurobox/arch/ppc/platforms/linkstation/5c372.c --- linux-2.4.20_hglan_htgl/arch/ppc/platforms/linkstation/5c372.c 2005-05-17 01:15:42.000000000 -0400 +++ linux-2.4.20_kurobox/arch/ppc/platforms/linkstation/5c372.c 2005-08-06 01:23:55.924241672 -0400 @@ -259,13 +259,12 @@ void melco_caribrate_decr(void) { ulong freq; - const ulong rev_freq; #if defined(CONFIG_HGLAN) || defined(CONFIG_HTGL) - rev_freq=32522240; /* {32.768MHz*(100% - 0.75%)} * 4 / 4 */ + const ulong rev_freq=32522240; /* {32.768MHz*(100% - 0.75%)} * 4 / 4 */ freq=32768000; #elif defined(CONFIG_HLAN) - rev_freq=24391680; /* {24.576MHz*(100% - 0.75%)} * 3 / 4 */ + const ulong rev_freq=24391680; /* {24.576MHz*(100% - 0.75%)} * 3 / 4 */ freq=24576000; #else #error "not defined" diff -ruN linux-2.4.20_hglan_htgl/arch/ppc/platforms/linkstation/ls_hwctl.c linux-2.4.20_kurobox/arch/ppc/platforms/linkstation/ls_hwctl.c --- linux-2.4.20_hglan_htgl/arch/ppc/platforms/linkstation/ls_hwctl.c 2004-11-30 08:34:33.000000000 -0500 +++ linux-2.4.20_kurobox/arch/ppc/platforms/linkstation/ls_hwctl.c 2005-08-06 01:23:18.385948360 -0400 @@ -15,6 +15,12 @@ #include #include +// output BYTE data +inline void out_b(volatile unsigned char *addr, int val) +{ + __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); +} + // PWR,DISK_FULL/STATUS,DIAG LED controll void blink_led(unsigned char state) { @@ -81,11 +87,4 @@ } - -// output BYTE data -inline void out_b(volatile unsigned char *addr, int val) -{ - __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); -} - // --------------------------------------------------------------- diff -ruN linux-2.4.20_hglan_htgl/net/core/neighbour.c linux-2.4.20_kurobox/net/core/neighbour.c --- linux-2.4.20_hglan_htgl/net/core/neighbour.c 2004-09-09 06:22:37.000000000 -0400 +++ linux-2.4.20_kurobox/net/core/neighbour.c 2005-08-06 01:27:37.043626416 -0400 @@ -994,7 +994,7 @@ next += neigh->parms->reachable_time; break; default: - /*XXX*/ + break; /*XXX*/ } if (old&NUD_IN_TIMER) { mod_timer(&neigh->timer, next);