Commit 101ddd26 authored by Tom Rini's avatar Tom Rini Committed by Paul Mackerras

PPC32: Remove more #ifdefs now that the config defines suitable

defaults for the advanced kernel config options.
parent f1577540
...@@ -41,11 +41,7 @@ extern void kmap_init(void) __init; ...@@ -41,11 +41,7 @@ extern void kmap_init(void) __init;
* easily, subsequent pte tables have to be allocated in one physical * easily, subsequent pte tables have to be allocated in one physical
* chunk of RAM. * chunk of RAM.
*/ */
#ifdef CONFIG_HIGHMEM_START_BOOL
#define PKMAP_BASE CONFIG_HIGHMEM_START #define PKMAP_BASE CONFIG_HIGHMEM_START
#else
#define PKMAP_BASE (0xfe000000UL)
#endif /* CONFIG_HIGHMEM_START_BOOL */
#define LAST_PKMAP 1024 #define LAST_PKMAP 1024
#define LAST_PKMAP_MASK (LAST_PKMAP-1) #define LAST_PKMAP_MASK (LAST_PKMAP-1)
#define PKMAP_NR(virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT) #define PKMAP_NR(virt) ((virt-PKMAP_BASE) >> PAGE_SHIFT)
......
...@@ -9,12 +9,8 @@ ...@@ -9,12 +9,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/config.h> #include <linux/config.h>
/* Be sure to change arch/ppc/Makefile to match */ /* This must match what is in arch/ppc/Makefile */
#ifdef CONFIG_KERNEL_START_BOOL
#define PAGE_OFFSET CONFIG_KERNEL_START #define PAGE_OFFSET CONFIG_KERNEL_START
#else
#define PAGE_OFFSET 0xc0000000
#endif /* CONFIG_KERNEL_START_BOOL */
#define KERNELBASE PAGE_OFFSET #define KERNELBASE PAGE_OFFSET
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment