File tree Expand file tree Collapse file tree 5 files changed +10
-9
lines changed Expand file tree Collapse file tree 5 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -374,7 +374,6 @@ config SINGLE_MEMORY_CHUNK
374
374
bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
375
375
depends on MMU
376
376
default y if SUN3 || MMU_COLDFIRE
377
- select NEED_MULTIPLE_NODES
378
377
help
379
378
Ignore all but the first contiguous chunk of physical memory for VM
380
379
purposes. This will save a few bytes kernel size and may speed up
Original file line number Diff line number Diff line change @@ -62,8 +62,10 @@ extern unsigned long _ramend;
62
62
#include <asm/page_no.h>
63
63
#endif
64
64
65
+ #ifdef CONFIG_DISCONTIGMEM
65
66
#define __phys_to_pfn (paddr ) ((unsigned long)((paddr) >> PAGE_SHIFT))
66
67
#define __pfn_to_phys (pfn ) PFN_PHYS(pfn)
68
+ #endif
67
69
68
70
#include <asm-generic/getorder.h>
69
71
Original file line number Diff line number Diff line change @@ -153,6 +153,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
153
153
pfn_to_virt(page_to_pfn(page)); \
154
154
})
155
155
156
+ #ifdef CONFIG_DISCONTIGMEM
156
157
#define pfn_to_page (pfn ) ({ \
157
158
unsigned long __pfn = (pfn); \
158
159
struct pglist_data *pgdat; \
@@ -165,6 +166,10 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
165
166
pgdat = &pg_data_map[page_to_nid(__p)]; \
166
167
((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \
167
168
})
169
+ #else
170
+ #define ARCH_PFN_OFFSET (m68k_memory[0].addr)
171
+ #include <asm-generic/memory_model.h>
172
+ #endif
168
173
169
174
#define virt_addr_valid (kaddr ) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
170
175
#define pfn_valid (pfn ) virt_addr_valid(pfn_to_virt(pfn))
Original file line number Diff line number Diff line change @@ -29,12 +29,7 @@ static inline void *phys_to_virt(unsigned long address)
29
29
}
30
30
31
31
/* Permanent address of a page. */
32
- #if defined(CONFIG_MMU ) && !defined(CONFIG_DISCONTIGMEM )
33
- #define page_to_phys (page ) \
34
- __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
35
- #else
36
32
#define page_to_phys (page ) (page_to_pfn(page) << PAGE_SHIFT)
37
- #endif
38
33
39
34
/*
40
35
* IO bus memory addresses are 1:1 with the physical address,
Original file line number Diff line number Diff line change @@ -42,12 +42,12 @@ EXPORT_SYMBOL(empty_zero_page);
42
42
43
43
#ifdef CONFIG_MMU
44
44
45
- pg_data_t pg_data_map [MAX_NUMNODES ];
46
- EXPORT_SYMBOL (pg_data_map );
47
-
48
45
int m68k_virt_to_node_shift ;
49
46
50
47
#ifdef CONFIG_DISCONTIGMEM
48
+ pg_data_t pg_data_map [MAX_NUMNODES ];
49
+ EXPORT_SYMBOL (pg_data_map );
50
+
51
51
pg_data_t * pg_data_table [65 ];
52
52
EXPORT_SYMBOL (pg_data_table );
53
53
#endif
You can’t perform that action at this time.
0 commit comments