Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r/kernel/: cleanups
m32r: export __ndelay
m32r: export empty_zero_page
m32r: don't offer CONFIG_ISA
m32r: remove the unused NOHIGHMEM option
+16
-54
+1
-9
arch/m32r/Kconfig
+1
-9
arch/m32r/Kconfig
···
216
216
default "01000000" if PLAT_M32104UT
217
217
default "00800000" if PLAT_OAKS32R
218
218
219
-
config NOHIGHMEM
220
-
bool
221
-
default y
222
-
223
219
config ARCH_DISCONTIGMEM_ENABLE
224
220
bool "Internal RAM Support"
225
221
depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104
···
406
410
source "drivers/pci/Kconfig"
407
411
408
412
config ISA
409
-
bool "ISA support"
410
-
help
411
-
Find out whether you have ISA slots on your motherboard. ISA is the
412
-
name of a bus system, i.e. the way the CPU talks to the other stuff
413
-
inside your box. If you have ISA, say Y, otherwise N.
413
+
bool
414
414
415
415
source "drivers/pcmcia/Kconfig"
416
416
+1
-1
arch/m32r/kernel/entry.S
+1
-1
arch/m32r/kernel/entry.S
···
143
143
and3 r4, r4, #0x8000 ; check BSM bit
144
144
#endif
145
145
beqz r4, resume_kernel
146
-
ENTRY(resume_userspace)
146
+
resume_userspace:
147
147
DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt
148
148
; setting need_resched or sigpending
149
149
; between sampling and the iret
-1
arch/m32r/kernel/head.S
-1
arch/m32r/kernel/head.S
-6
arch/m32r/kernel/irq.c
-6
arch/m32r/kernel/irq.c
···
22
22
#include <linux/module.h>
23
23
#include <asm/uaccess.h>
24
24
25
-
atomic_t irq_err_count;
26
-
atomic_t irq_mis_count;
27
-
28
25
/*
29
26
* Generic, controller-independent functions:
30
27
*/
···
60
63
seq_putc(p, '\n');
61
64
skip:
62
65
spin_unlock_irqrestore(&irq_desc[i].lock, flags);
63
-
} else if (i == NR_IRQS) {
64
-
seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
65
-
seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
66
66
}
67
67
return 0;
68
68
}
+2
arch/m32r/kernel/m32r_ksyms.c
+2
arch/m32r/kernel/m32r_ksyms.c
···
14
14
#include <asm/delay.h>
15
15
#include <asm/irq.h>
16
16
#include <asm/tlbflush.h>
17
+
#include <asm/pgtable.h>
17
18
18
19
/* platform dependent support */
19
20
EXPORT_SYMBOL(boot_cpu_data);
···
66
65
EXPORT_SYMBOL(copy_page);
67
66
EXPORT_SYMBOL(clear_page);
68
67
EXPORT_SYMBOL(strlen);
68
+
EXPORT_SYMBOL(empty_zero_page);
69
69
70
70
EXPORT_SYMBOL(_inb);
71
71
EXPORT_SYMBOL(_inw);
+2
-28
arch/m32r/kernel/process.c
+2
-28
arch/m32r/kernel/process.c
···
35
35
36
36
#include <linux/err.h>
37
37
38
-
static int hlt_counter=0;
39
-
40
38
/*
41
39
* Return saved PC of a blocked thread.
42
40
*/
···
46
48
/*
47
49
* Powermanagement idle function, if any..
48
50
*/
49
-
void (*pm_idle)(void) = NULL;
50
-
EXPORT_SYMBOL(pm_idle);
51
+
static void (*pm_idle)(void) = NULL;
51
52
52
53
void (*pm_power_off)(void) = NULL;
53
54
EXPORT_SYMBOL(pm_power_off);
54
-
55
-
void disable_hlt(void)
56
-
{
57
-
hlt_counter++;
58
-
}
59
-
60
-
EXPORT_SYMBOL(disable_hlt);
61
-
62
-
void enable_hlt(void)
63
-
{
64
-
hlt_counter--;
65
-
}
66
-
67
-
EXPORT_SYMBOL(enable_hlt);
68
55
69
56
/*
70
57
* We use this is we don't have any better
71
58
* idle routine..
72
59
*/
73
-
void default_idle(void)
60
+
static void default_idle(void)
74
61
{
75
62
/* M32R_FIXME: Please use "cpu_sleep" mode. */
76
63
cpu_relax();
···
241
258
tsk->thread.lr = (unsigned long)ret_from_fork;
242
259
243
260
return 0;
244
-
}
245
-
246
-
/*
247
-
* Capture the user space registers if the task is not running (in user space)
248
-
*/
249
-
int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
250
-
{
251
-
/* M32R_FIXME */
252
-
return 1;
253
261
}
254
262
255
263
asmlinkage int sys_fork(unsigned long r0, unsigned long r1, unsigned long r2,
+2
-2
arch/m32r/kernel/smp.c
+2
-2
arch/m32r/kernel/smp.c
···
84
84
void smp_ipi_timer_interrupt(struct pt_regs *);
85
85
void smp_local_timer_interrupt(void);
86
86
87
-
void send_IPI_allbutself(int, int);
87
+
static void send_IPI_allbutself(int, int);
88
88
static void send_IPI_mask(cpumask_t, int, int);
89
89
unsigned long send_IPI_mask_phys(cpumask_t, int, int);
90
90
···
722
722
* ---------- --- --------------------------------------------------------
723
723
*
724
724
*==========================================================================*/
725
-
void send_IPI_allbutself(int ipi_num, int try)
725
+
static void send_IPI_allbutself(int ipi_num, int try)
726
726
{
727
727
cpumask_t cpumask;
728
728
+2
-3
arch/m32r/kernel/time.c
+2
-3
arch/m32r/kernel/time.c
···
34
34
#include <asm/hw_irq.h>
35
35
36
36
#ifdef CONFIG_SMP
37
-
extern void send_IPI_allbutself(int, int);
38
37
extern void smp_local_timer_interrupt(void);
39
38
#endif
40
39
···
187
188
* timer_interrupt() needs to keep up the real-time clock,
188
189
* as well as call the "do_timer()" routine every clocktick
189
190
*/
190
-
irqreturn_t timer_interrupt(int irq, void *dev_id)
191
+
static irqreturn_t timer_interrupt(int irq, void *dev_id)
191
192
{
192
193
#ifndef CONFIG_SMP
193
194
profile_tick(CPU_PROFILING);
···
227
228
return IRQ_HANDLED;
228
229
}
229
230
230
-
struct irqaction irq0 = {
231
+
static struct irqaction irq0 = {
231
232
.handler = timer_interrupt,
232
233
.flags = IRQF_DISABLED,
233
234
.mask = CPU_MASK_NONE,
+4
-4
arch/m32r/kernel/traps.c
+4
-4
arch/m32r/kernel/traps.c
···
61
61
((unsigned long)func - (unsigned long)eit_vector - entry*4)/4 \
62
62
+ 0xff000000UL
63
63
64
-
void set_eit_vector_entries(void)
64
+
static void set_eit_vector_entries(void)
65
65
{
66
66
extern void default_eit_handler(void);
67
67
extern void system_call(void);
···
121
121
cpu_init();
122
122
}
123
123
124
-
int kstack_depth_to_print = 24;
124
+
static int kstack_depth_to_print = 24;
125
125
126
-
void show_trace(struct task_struct *task, unsigned long *stack)
126
+
static void show_trace(struct task_struct *task, unsigned long *stack)
127
127
{
128
128
unsigned long addr;
129
129
···
224
224
printk("\n");
225
225
}
226
226
227
-
DEFINE_SPINLOCK(die_lock);
227
+
static DEFINE_SPINLOCK(die_lock);
228
228
229
229
void die(const char * str, struct pt_regs * regs, long err)
230
230
{
+2
arch/m32r/lib/delay.c
+2
arch/m32r/lib/delay.c