diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /arch/m32r | |
parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/boot/compressed/misc.c | 37 | ||||
-rw-r--r-- | arch/m32r/mm/discontig.c | 10 | ||||
-rw-r--r-- | arch/m32r/mm/init.c | 6 |
3 files changed, 5 insertions, 48 deletions
diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c index 600d40e33495..d394292498c0 100644 --- a/arch/m32r/boot/compressed/misc.c +++ b/arch/m32r/boot/compressed/misc.c | |||
@@ -70,8 +70,6 @@ static unsigned outcnt = 0; /* bytes in output buffer */ | |||
70 | static int fill_inbuf(void); | 70 | static int fill_inbuf(void); |
71 | static void flush_window(void); | 71 | static void flush_window(void); |
72 | static void error(char *m); | 72 | static void error(char *m); |
73 | static void gzip_mark(void **); | ||
74 | static void gzip_release(void **); | ||
75 | 73 | ||
76 | static unsigned char *input_data; | 74 | static unsigned char *input_data; |
77 | static int input_len; | 75 | static int input_len; |
@@ -82,9 +80,6 @@ static unsigned long output_ptr = 0; | |||
82 | 80 | ||
83 | #include "m32r_sio.c" | 81 | #include "m32r_sio.c" |
84 | 82 | ||
85 | static void *malloc(int size); | ||
86 | static void free(void *where); | ||
87 | |||
88 | static unsigned long free_mem_ptr; | 83 | static unsigned long free_mem_ptr; |
89 | static unsigned long free_mem_end_ptr; | 84 | static unsigned long free_mem_end_ptr; |
90 | 85 | ||
@@ -92,38 +87,6 @@ static unsigned long free_mem_end_ptr; | |||
92 | 87 | ||
93 | #include "../../../../lib/inflate.c" | 88 | #include "../../../../lib/inflate.c" |
94 | 89 | ||
95 | static void *malloc(int size) | ||
96 | { | ||
97 | void *p; | ||
98 | |||
99 | if (size <0) error("Malloc error"); | ||
100 | if (free_mem_ptr == 0) error("Memory error"); | ||
101 | |||
102 | free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */ | ||
103 | |||
104 | p = (void *)free_mem_ptr; | ||
105 | free_mem_ptr += size; | ||
106 | |||
107 | if (free_mem_ptr >= free_mem_end_ptr) | ||
108 | error("Out of memory"); | ||
109 | |||
110 | return p; | ||
111 | } | ||
112 | |||
113 | static void free(void *where) | ||
114 | { /* Don't care */ | ||
115 | } | ||
116 | |||
117 | static void gzip_mark(void **ptr) | ||
118 | { | ||
119 | *ptr = (void *) free_mem_ptr; | ||
120 | } | ||
121 | |||
122 | static void gzip_release(void **ptr) | ||
123 | { | ||
124 | free_mem_ptr = (long) *ptr; | ||
125 | } | ||
126 | |||
127 | void* memset(void* s, int c, size_t n) | 90 | void* memset(void* s, int c, size_t n) |
128 | { | 91 | { |
129 | int i; | 92 | int i; |
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index 07c1af7dc0e2..cbc3c4c54566 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c | |||
@@ -20,7 +20,6 @@ extern char _end[]; | |||
20 | 20 | ||
21 | struct pglist_data *node_data[MAX_NUMNODES]; | 21 | struct pglist_data *node_data[MAX_NUMNODES]; |
22 | EXPORT_SYMBOL(node_data); | 22 | EXPORT_SYMBOL(node_data); |
23 | static bootmem_data_t node_bdata[MAX_NUMNODES] __initdata; | ||
24 | 23 | ||
25 | pg_data_t m32r_node_data[MAX_NUMNODES]; | 24 | pg_data_t m32r_node_data[MAX_NUMNODES]; |
26 | 25 | ||
@@ -81,7 +80,7 @@ unsigned long __init setup_memory(void) | |||
81 | for_each_online_node(nid) { | 80 | for_each_online_node(nid) { |
82 | mp = &mem_prof[nid]; | 81 | mp = &mem_prof[nid]; |
83 | NODE_DATA(nid)=(pg_data_t *)&m32r_node_data[nid]; | 82 | NODE_DATA(nid)=(pg_data_t *)&m32r_node_data[nid]; |
84 | NODE_DATA(nid)->bdata = &node_bdata[nid]; | 83 | NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; |
85 | min_pfn = mp->start_pfn; | 84 | min_pfn = mp->start_pfn; |
86 | max_pfn = mp->start_pfn + mp->pages; | 85 | max_pfn = mp->start_pfn + mp->pages; |
87 | bootmap_size = init_bootmem_node(NODE_DATA(nid), mp->free_pfn, | 86 | bootmap_size = init_bootmem_node(NODE_DATA(nid), mp->free_pfn, |
@@ -124,8 +123,7 @@ unsigned long __init setup_memory(void) | |||
124 | return max_low_pfn; | 123 | return max_low_pfn; |
125 | } | 124 | } |
126 | 125 | ||
127 | #define START_PFN(nid) \ | 126 | #define START_PFN(nid) (NODE_DATA(nid)->bdata->node_min_pfn) |
128 | (NODE_DATA(nid)->bdata->node_boot_start >> PAGE_SHIFT) | ||
129 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) | 127 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) |
130 | 128 | ||
131 | unsigned long __init zone_sizes_init(void) | 129 | unsigned long __init zone_sizes_init(void) |
@@ -148,8 +146,7 @@ unsigned long __init zone_sizes_init(void) | |||
148 | zholes_size[ZONE_DMA] = mp->holes; | 146 | zholes_size[ZONE_DMA] = mp->holes; |
149 | holes += zholes_size[ZONE_DMA]; | 147 | holes += zholes_size[ZONE_DMA]; |
150 | 148 | ||
151 | free_area_init_node(nid, NODE_DATA(nid), zones_size, | 149 | free_area_init_node(nid, zones_size, start_pfn, zholes_size); |
152 | start_pfn, zholes_size); | ||
153 | } | 150 | } |
154 | 151 | ||
155 | /* | 152 | /* |
@@ -163,4 +160,3 @@ unsigned long __init zone_sizes_init(void) | |||
163 | 160 | ||
164 | return holes; | 161 | return holes; |
165 | } | 162 | } |
166 | |||
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index bbd97c85bc5d..2554eb59cfef 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
@@ -93,8 +93,7 @@ void free_initrd_mem(unsigned long, unsigned long); | |||
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | /* It'd be good if these lines were in the standard header file. */ | 95 | /* It'd be good if these lines were in the standard header file. */ |
96 | #define START_PFN(nid) \ | 96 | #define START_PFN(nid) (NODE_DATA(nid)->bdata->node_min_pfn) |
97 | (NODE_DATA(nid)->bdata->node_boot_start >> PAGE_SHIFT) | ||
98 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) | 97 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) |
99 | 98 | ||
100 | #ifndef CONFIG_DISCONTIGMEM | 99 | #ifndef CONFIG_DISCONTIGMEM |
@@ -123,7 +122,7 @@ unsigned long __init zone_sizes_init(void) | |||
123 | start_pfn = __MEMORY_START >> PAGE_SHIFT; | 122 | start_pfn = __MEMORY_START >> PAGE_SHIFT; |
124 | #endif /* CONFIG_MMU */ | 123 | #endif /* CONFIG_MMU */ |
125 | 124 | ||
126 | free_area_init_node(0, NODE_DATA(0), zones_size, start_pfn, 0); | 125 | free_area_init_node(0, zones_size, start_pfn, 0); |
127 | 126 | ||
128 | return 0; | 127 | return 0; |
129 | } | 128 | } |
@@ -252,4 +251,3 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
252 | printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); | 251 | printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); |
253 | } | 252 | } |
254 | #endif | 253 | #endif |
255 | |||