diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-21 22:16:05 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-21 22:16:05 +0000 |
| commit | 73ed328f3a698087551b4d6a36196b0819bc38af (patch) | |
| tree | d0907f2e7e5f36ea0808ed6b1f10c5caf51478a5 /arch/alpha | |
| parent | 89a61cd744a621efff2a4d7f0d99258f850338f2 (diff) | |
Cleanup, sync with others sources.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/boot/bootp.c | 8 | ||||
| -rw-r--r-- | arch/alpha/boot/main.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/alpha/mm/init.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c index 34645a643..90fccb766 100644 --- a/arch/alpha/boot/bootp.c +++ b/arch/alpha/boot/bootp.c @@ -200,11 +200,11 @@ start_kernel(void) load(START_ADDR+(4*KERNEL_SIZE), KERNEL_ORIGIN, KERNEL_SIZE); load(START_ADDR, START_ADDR+(4*KERNEL_SIZE), KERNEL_SIZE); - memset((char*)ZERO_PAGE, 0, PAGE_SIZE); - strcpy((char*)ZERO_PAGE, envval); + memset((char*)ZERO_PAGE(0), 0, PAGE_SIZE); + strcpy((char*)ZERO_PAGE(0), envval); #ifdef INITRD_SIZE - ((long *)(ZERO_PAGE+256))[0] = initrd_start; - ((long *)(ZERO_PAGE+256))[1] = INITRD_SIZE; + ((long *)(ZERO_PAGE(0)+256))[0] = initrd_start; + ((long *)(ZERO_PAGE(0)+256))[1] = INITRD_SIZE; #endif runkernel(); diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c index dd4e47ab5..c97896e8b 100644 --- a/arch/alpha/boot/main.c +++ b/arch/alpha/boot/main.c @@ -182,7 +182,7 @@ void start_kernel(void) nbytes = 0; } envval[nbytes] = '\0'; - strcpy((char*)ZERO_PAGE, envval); + strcpy((char*)ZERO_PAGE(0), envval); srm_printk(" Ok\nNow booting the kernel\n"); runkernel(); diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 80b4454e1..1c9e5a345 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -66,7 +66,7 @@ static void get_sysnames(long, long, char **, char **); * initialized, we need to copy things out into a more permanent * place. */ -#define PARAM ZERO_PAGE +#define PARAM ZERO_PAGE(0) #define COMMAND_LINE ((char*)(PARAM + 0x0000)) #define COMMAND_LINE_SIZE 256 #define INITRD_START (*(unsigned long *) (PARAM+0x100)) diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index fc5a964bb..43d21186b 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -219,7 +219,7 @@ paging_init(unsigned long start_mem, unsigned long end_mem) /* Initialize the kernel's page tables. Linux puts the vptb in the last slot of the L1 page table. */ - memset((void *) ZERO_PAGE, 0, PAGE_SIZE); + memset((void *) ZERO_PAGE(0), 0, PAGE_SIZE); memset(swapper_pg_dir, 0, PAGE_SIZE); newptbr = ((unsigned long) swapper_pg_dir - PAGE_OFFSET) >> PAGE_SHIFT; pgd_val(swapper_pg_dir[1023]) = |