Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: Fix IPI function calls for SMP
m32r: Fix set_memory() for DISCONTIGMEM
m32r: add rtc_lock variable
m32r: define ioread* and iowrite* macros
m32r: export delay loop symbols
m32r: fix tme_handler
+34
-13
+7
arch/m32r/include/asm/io.h
+7
arch/m32r/include/asm/io.h
···
162
162
#define __raw_writew writew
163
163
#define __raw_writel writel
164
164
165
+
#define ioread8 read
166
+
#define ioread16 readw
167
+
#define ioread32 readl
168
+
#define iowrite8 writeb
169
+
#define iowrite16 writew
170
+
#define iowrite32 writel
171
+
165
172
#define mmiowb()
166
173
167
174
#define flush_write_buffers() do { } while (0) /* M32R_FIXME */
-6
arch/m32r/kernel/m32r_ksyms.c
-6
arch/m32r/kernel/m32r_ksyms.c
···
23
23
EXPORT_SYMBOL(iounmap);
24
24
EXPORT_SYMBOL(kernel_thread);
25
25
26
-
/* Networking helper routines. */
27
-
/* Delay loops */
28
-
EXPORT_SYMBOL(__udelay);
29
-
EXPORT_SYMBOL(__delay);
30
-
EXPORT_SYMBOL(__const_udelay);
31
-
32
26
EXPORT_SYMBOL(strncpy_from_user);
33
27
EXPORT_SYMBOL(__strncpy_from_user);
34
28
EXPORT_SYMBOL(clear_user);
+9
arch/m32r/kernel/time.c
+9
arch/m32r/kernel/time.c
···
33
33
34
34
#include <asm/hw_irq.h>
35
35
36
+
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
37
+
/* this needs a better home */
38
+
DEFINE_SPINLOCK(rtc_lock);
39
+
40
+
#ifdef CONFIG_RTC_DRV_CMOS_MODULE
41
+
EXPORT_SYMBOL(rtc_lock);
42
+
#endif
43
+
#endif /* pc-style 'CMOS' RTC support */
44
+
36
45
#ifdef CONFIG_SMP
37
46
extern void smp_local_timer_interrupt(void);
38
47
#endif
+2
-2
arch/m32r/kernel/traps.c
+2
-2
arch/m32r/kernel/traps.c
···
104
104
eit_vector[186] = (unsigned long)smp_call_function_interrupt;
105
105
eit_vector[187] = (unsigned long)smp_ipi_timer_interrupt;
106
106
eit_vector[188] = (unsigned long)smp_flush_cache_all_interrupt;
107
-
eit_vector[189] = (unsigned long)smp_call_function_single_interrupt;
108
-
eit_vector[190] = 0;
107
+
eit_vector[189] = 0; /* CPU_BOOT_IPI */
108
+
eit_vector[190] = (unsigned long)smp_call_function_single_interrupt;
109
109
eit_vector[191] = 0;
110
110
#endif
111
111
_flush_cache_copyback_all();
+4
arch/m32r/lib/delay.c
+4
arch/m32r/lib/delay.c
+4
-1
arch/m32r/mm/discontig.c
+4
-1
arch/m32r/mm/discontig.c
···
32
32
} mem_prof_t;
33
33
static mem_prof_t mem_prof[MAX_NUMNODES];
34
34
35
+
extern unsigned long memory_start;
36
+
extern unsigned long memory_end;
37
+
35
38
static void __init mem_prof_init(void)
36
39
{
37
40
unsigned long start_pfn, holes, free_pfn;
···
45
42
/* Node#0 SDRAM */
46
43
mp = &mem_prof[0];
47
44
mp->start_pfn = PFN_UP(CONFIG_MEMORY_START);
48
-
mp->pages = PFN_DOWN(CONFIG_MEMORY_SIZE);
45
+
mp->pages = PFN_DOWN(memory_end - memory_start);
49
46
mp->holes = 0;
50
47
mp->free_pfn = PFN_UP(__pa(_end));
51
48
+8
-4
arch/m32r/mm/mmu.S
+8
-4
arch/m32r/mm/mmu.S
···
150
150
151
151
; pmd = pmd_offset(pgd, address);
152
152
ld r3, @r3 ; r3: pmd data
153
-
ldi r2, #-4096
154
153
beqz r3, 3f ; pmd_none(*pmd) ?
154
+
155
+
and3 r2, r3, #0xfff
156
+
add3 r2, r2, #-355 ; _KERNPG_TABLE(=0x163)
157
+
bnez r2, 3f ; pmd_bad(*pmd) ?
158
+
ldi r2, #-4096
155
159
156
160
; pte = pte_offset(pmd, address);
157
161
and r2, r3 ; r2: pte base addr
···
267
263
ld r1, @r3 ; r1: pmd
268
264
beqz r1, 3f ; pmd_none(*pmd) ?
269
265
;
270
-
and3 r1, r1, #0xeff
271
-
ldi r4, #611 ; _KERNPG_TABLE(=611)
272
-
bne r1, r4, 3f ; !pmd_bad(*pmd) ?
266
+
and3 r1, r1, #0x3ff
267
+
ldi r4, #0x163 ; _KERNPG_TABLE(=0x163)
268
+
bne r1, r4, 3f ; pmd_bad(*pmd) ?
273
269
274
270
.fillinsn
275
271
4: