diff options
| author | Paul Mackerras <paulus@samba.org> | 2003-07-25 09:33:53 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2003-07-25 09:33:53 -0400 |
| commit | 2fc22857b3de482b1bbd8137289d4fbbe58c89e6 (patch) | |
| tree | ef0a0537e56f5a376ca488ab7fbe993d67b0b32c | |
| parent | 03b0b9ecdf7eec36443c1a15fe6839c7245dcfa8 (diff) | |
| parent | e0b9d63fa79051835dd04fd6377aa9778e348be7 (diff) | |
Merge bk://ppc@ppc.bkbits.net/for-linus-ppc
into samba.org:/home/paulus/kernel/for-linus-ppc
| -rw-r--r-- | arch/ppc/kernel/setup.c | 5 | ||||
| -rw-r--r-- | arch/ppc/syslib/prom_init.c | 5 | ||||
| -rw-r--r-- | include/asm-ppc/local.h | 6 | ||||
| -rw-r--r-- | include/asm-ppc/sections.h | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 27be4e413106..2d481b4ced8c 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c @@ -268,7 +268,6 @@ __init unsigned long early_init(int r3, int r4, int r5) { - extern char __bss_start, _end; unsigned long phys; unsigned long offset = reloc_offset(); @@ -277,7 +276,7 @@ early_init(int r3, int r4, int r5) /* 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 @@ -466,7 +465,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, struct bi_record *find_bootinfo(void) { struct bi_record *rec; - extern char __bss_start[]; rec = (struct bi_record *)_ALIGN((ulong)__bss_start+(1<<20)-1,(1<<20)); if ( rec->tag != BI_FIRST ) { @@ -591,7 +589,6 @@ arch_initcall(ppc_init); void __init setup_arch(char **cmdline_p) { extern int panic_timeout; - extern char _etext[], _edata[]; extern char *klimit; extern void do_init_bootmem(void); diff --git a/arch/ppc/syslib/prom_init.c b/arch/ppc/syslib/prom_init.c index 047e1bf54f96..2e4467bcf31e 100644 --- a/arch/ppc/syslib/prom_init.c +++ b/arch/ppc/syslib/prom_init.c @@ -133,7 +133,6 @@ char *bootdevice; struct device_node *allnodes; extern char *klimit; -extern char _stext; static void __init prom_exit(void) @@ -601,7 +600,7 @@ prom_hold_cpus(unsigned long mem) /* copy the holding pattern code to someplace safe (0) */ /* the holding pattern is now within the first 0x100 bytes of the kernel image -- paulus */ - memcpy((void *)0, &_stext, 0x100); + memcpy((void *)0, _stext, 0x100); flush_icache_range(0, 0x100); /* look for cpus */ @@ -631,7 +630,7 @@ prom_hold_cpus(unsigned long mem) prom_print(path); *(ulong *)(0x4) = 0; call_prom("start-cpu", 3, 0, node, - (char *)__secondary_hold - &_stext, cpu); + (char *)__secondary_hold - _stext, cpu); prom_print("..."); for ( i = 0 ; (i < 10000) && (*(ulong *)(0x4) == 0); i++ ) ; diff --git a/include/asm-ppc/local.h b/include/asm-ppc/local.h new file mode 100644 index 000000000000..b08e3eced10e --- /dev/null +++ b/include/asm-ppc/local.h @@ -0,0 +1,6 @@ +#ifndef __PPC_LOCAL_H +#define __PPC_LOCAL_H + +#include <asm-generic/local.h> + +#endif /* __PPC_LOCAL_H */ diff --git a/include/asm-ppc/sections.h b/include/asm-ppc/sections.h index 564e1e58f141..0a06f83dd543 100644 --- a/include/asm-ppc/sections.h +++ b/include/asm-ppc/sections.h @@ -2,6 +2,10 @@ #ifndef _PPC_SECTIONS_H #define _PPC_SECTIONS_H +#include <asm-generic/sections.h> + +extern char _end[]; + #define __pmac __attribute__ ((__section__ (".pmac.text"))) #define __pmacdata __attribute__ ((__section__ (".pmac.data"))) #define __pmacfunc(__argpmac) \ |