tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
[MIPS] ARC: Remove unused arch/mips/arc/console.c
[MIPS] SNI: sniprom
[MIPS] Jazz: remove unneeded reset functions
[MIPS] Whitespace cleanup.
[MIPS] Make resources for ds1742 "static __initdata"
[MIPS] Replace __attribute_used__ with __used
[MIPS] Jazz: Remove unused arch/mips/jazz/io.c
[MIPS] Mark prom_free_prom_memory as __init_refok
[MIPS] MIPSsim: Fix cflags
+16
-200
+1
-1
arch/mips/Makefile
+1
-1
arch/mips/Makefile
-31
arch/mips/arc/console.c
-31
arch/mips/arc/console.c
···
1
-
/*
2
-
* This file is subject to the terms and conditions of the GNU General Public
3
-
* License. See the file "COPYING" in the main directory of this archive
4
-
* for more details.
5
-
*
6
-
* Copyright (C) 1996 David S. Miller (dm@sgi.com)
7
-
* Compability with board caches, Ulf Carlsson
8
-
*/
9
-
#include <linux/kernel.h>
10
-
#include <asm/sgialib.h>
11
-
#include <asm/bcache.h>
12
-
13
-
/*
14
-
* IP22 boardcache is not compatible with board caches. Thus we disable it
15
-
* during romvec action. Since r4xx0.c is always compiled and linked with your
16
-
* kernel, this shouldn't cause any harm regardless what MIPS processor you
17
-
* have.
18
-
*
19
-
* The ARC write and read functions seem to interfere with the serial lines
20
-
* in some way. You should be careful with them.
21
-
*/
22
-
23
-
void prom_putchar(char c)
24
-
{
25
-
ULONG cnt;
26
-
CHAR it = c;
27
-
28
-
bc_disable();
29
-
ArcWrite(1, &it, 1, &cnt);
30
-
bc_enable();
31
-
}
-135
arch/mips/jazz/io.c
-135
arch/mips/jazz/io.c
···
1
-
/*
2
-
* This file is subject to the terms and conditions of the GNU General Public
3
-
* License. See the file "COPYING" in the main directory of this archive
4
-
* for more details.
5
-
*
6
-
* Low level I/O functions for Jazz family machines.
7
-
*
8
-
* Copyright (C) 1997 by Ralf Baechle.
9
-
*/
10
-
#include <linux/string.h>
11
-
#include <linux/spinlock.h>
12
-
#include <asm/addrspace.h>
13
-
#include <asm/system.h>
14
-
#include <asm/jazz.h>
15
-
16
-
/*
17
-
* Map an 16mb segment of the EISA address space to 0xe3000000;
18
-
*/
19
-
static inline void map_eisa_address(unsigned long address)
20
-
{
21
-
/* XXX */
22
-
/* We've got an wired entry in the TLB. We just need to modify it.
23
-
fast and clean. But since we want to get rid of wired entries
24
-
things are a little bit more complicated ... */
25
-
}
26
-
27
-
static unsigned char jazz_readb(unsigned long addr)
28
-
{
29
-
unsigned char res;
30
-
31
-
map_eisa_address(addr);
32
-
addr &= 0xffffff;
33
-
res = *(volatile unsigned char *) (JAZZ_EISA_BASE + addr);
34
-
35
-
return res;
36
-
}
37
-
38
-
static unsigned short jazz_readw(unsigned long addr)
39
-
{
40
-
unsigned short res;
41
-
42
-
map_eisa_address(addr);
43
-
addr &= 0xffffff;
44
-
res = *(volatile unsigned char *) (JAZZ_EISA_BASE + addr);
45
-
46
-
return res;
47
-
}
48
-
49
-
static unsigned int jazz_readl(unsigned long addr)
50
-
{
51
-
unsigned int res;
52
-
53
-
map_eisa_address(addr);
54
-
addr &= 0xffffff;
55
-
res = *(volatile unsigned char *) (JAZZ_EISA_BASE + addr);
56
-
57
-
return res;
58
-
}
59
-
60
-
static void jazz_writeb(unsigned char val, unsigned long addr)
61
-
{
62
-
map_eisa_address(addr);
63
-
addr &= 0xffffff;
64
-
*(volatile unsigned char *) (JAZZ_EISA_BASE + addr) = val;
65
-
}
66
-
67
-
static void jazz_writew(unsigned short val, unsigned long addr)
68
-
{
69
-
map_eisa_address(addr);
70
-
addr &= 0xffffff;
71
-
*(volatile unsigned char *) (JAZZ_EISA_BASE + addr) = val;
72
-
}
73
-
74
-
static void jazz_writel(unsigned int val, unsigned long addr)
75
-
{
76
-
map_eisa_address(addr);
77
-
addr &= 0xffffff;
78
-
*(volatile unsigned char *) (JAZZ_EISA_BASE + addr) = val;
79
-
}
80
-
81
-
static void jazz_memset_io(unsigned long addr, int val, unsigned long len)
82
-
{
83
-
unsigned long waddr;
84
-
85
-
waddr = JAZZ_EISA_BASE | (addr & 0xffffff);
86
-
while(len) {
87
-
unsigned long fraglen;
88
-
89
-
fraglen = (~addr + 1) & 0xffffff;
90
-
fraglen = (fraglen < len) ? fraglen : len;
91
-
map_eisa_address(addr);
92
-
memset((char *)waddr, val, fraglen);
93
-
addr += fraglen;
94
-
waddr = waddr + fraglen - 0x1000000;
95
-
len -= fraglen;
96
-
}
97
-
}
98
-
99
-
static void jazz_memcpy_fromio(unsigned long to, unsigned long from, unsigned long len)
100
-
{
101
-
unsigned long waddr;
102
-
103
-
waddr = JAZZ_EISA_BASE | (from & 0xffffff);
104
-
while(len) {
105
-
unsigned long fraglen;
106
-
107
-
fraglen = (~from + 1) & 0xffffff;
108
-
fraglen = (fraglen < len) ? fraglen : len;
109
-
map_eisa_address(from);
110
-
memcpy((void *)to, (void *)waddr, fraglen);
111
-
to += fraglen;
112
-
from += fraglen;
113
-
waddr = waddr + fraglen - 0x1000000;
114
-
len -= fraglen;
115
-
}
116
-
}
117
-
118
-
static void jazz_memcpy_toio(unsigned long to, unsigned long from, unsigned long len)
119
-
{
120
-
unsigned long waddr;
121
-
122
-
waddr = JAZZ_EISA_BASE | (to & 0xffffff);
123
-
while(len) {
124
-
unsigned long fraglen;
125
-
126
-
fraglen = (~to + 1) & 0xffffff;
127
-
fraglen = (fraglen < len) ? fraglen : len;
128
-
map_eisa_address(to);
129
-
memcpy((char *)to + JAZZ_EISA_BASE, (void *)from, fraglen);
130
-
to += fraglen;
131
-
from += fraglen;
132
-
waddr = waddr + fraglen - 0x1000000;
133
-
len -= fraglen;
134
-
}
135
-
}
-13
arch/mips/jazz/reset.c
-13
arch/mips/jazz/reset.c
···
6
6
*/
7
7
#include <linux/jiffies.h>
8
8
#include <asm/jazz.h>
9
-
#include <asm/io.h>
10
-
#include <asm/system.h>
11
-
#include <asm/reboot.h>
12
-
#include <asm/delay.h>
13
9
14
10
#define KBD_STAT_IBF 0x02 /* Keyboard input buffer full */
15
11
···
53
57
kb_wait();
54
58
jazz_write_output (0x00);
55
59
}
56
-
}
57
-
58
-
void jazz_machine_halt(void)
59
-
{
60
-
}
61
-
62
-
void jazz_machine_power_off(void)
63
-
{
64
-
/* Jazz machines don't have a software power switch */
65
60
}
-4
arch/mips/jazz/setup.c
-4
arch/mips/jazz/setup.c
···
34
34
extern asmlinkage void jazz_handle_int(void);
35
35
36
36
extern void jazz_machine_restart(char *command);
37
-
extern void jazz_machine_halt(void);
38
-
extern void jazz_machine_power_off(void);
39
37
40
38
void __init plat_timer_setup(struct irqaction *irq)
41
39
{
···
93
95
/* The RTC is outside the port address space */
94
96
95
97
_machine_restart = jazz_machine_restart;
96
-
_machine_halt = jazz_machine_halt;
97
-
pm_power_off = jazz_machine_power_off;
98
98
99
99
screen_info = (struct screen_info) {
100
100
0, 0, /* orig-x, orig-y */
+1
-1
arch/mips/jmr3927/rbhma3100/setup.c
+1
-1
arch/mips/jmr3927/rbhma3100/setup.c
+2
-2
arch/mips/kernel/gdb-stub.c
+2
-2
arch/mips/kernel/gdb-stub.c
···
1099
1099
* malloc is needed by gdb client in "call func()", even a private one
1100
1100
* will make gdb happy
1101
1101
*/
1102
-
static void * __attribute_used__ malloc(size_t size)
1102
+
static void __used *malloc(size_t size)
1103
1103
{
1104
1104
return kmalloc(size, GFP_ATOMIC);
1105
1105
}
1106
1106
1107
-
static void __attribute_used__ free (void *where)
1107
+
static void __used free(void *where)
1108
1108
{
1109
1109
kfree(where);
1110
1110
}
+1
-1
arch/mips/kernel/head.S
+1
-1
arch/mips/kernel/head.S
+1
-1
arch/mips/kernel/linux32.c
+1
-1
arch/mips/kernel/linux32.c
+1
-1
arch/mips/kernel/rtlx.c
+1
-1
arch/mips/kernel/rtlx.c
+2
-2
arch/mips/kernel/syscall.c
+2
-2
arch/mips/kernel/syscall.c
···
167
167
}
168
168
169
169
save_static_function(sys_fork);
170
-
__attribute_used__ noinline static int
170
+
static int __used noinline
171
171
_sys_fork(nabi_no_regargs struct pt_regs regs)
172
172
{
173
173
return do_fork(SIGCHLD, regs.regs[29], ®s, 0, NULL, NULL);
174
174
}
175
175
176
176
save_static_function(sys_clone);
177
-
__attribute_used__ noinline static int
177
+
static int __used noinline
178
178
_sys_clone(nabi_no_regargs struct pt_regs regs)
179
179
{
180
180
unsigned long clone_flags;
+1
-2
arch/mips/kernel/vpe.c
+1
-2
arch/mips/kernel/vpe.c
···
154
154
};
155
155
156
156
static void release_progmem(void *ptr);
157
-
/* static __attribute_used__ void dump_vpe(struct vpe * v); */
158
157
extern void save_gp_address(unsigned int secbase, unsigned int rel);
159
158
160
159
/* get the vpe associated with this minor */
···
1023
1024
return 0;
1024
1025
}
1025
1026
1026
-
__attribute_used__ void dump_vpe(struct vpe * v)
1027
+
void __used dump_vpe(struct vpe * v)
1027
1028
{
1028
1029
struct tc *t;
1029
1030
+1
-1
arch/mips/mm/c-sb1.c
+1
-1
arch/mips/mm/c-sb1.c
+1
-1
arch/mips/mm/init.c
+1
-1
arch/mips/mm/init.c
+3
-2
arch/mips/sni/sniprom.c
+3
-2
arch/mips/sni/sniprom.c
···
19
19
#include <asm/addrspace.h>
20
20
#include <asm/sni.h>
21
21
#include <asm/mipsprom.h>
22
+
#include <asm/mipsregs.h>
22
23
#include <asm/bootinfo.h>
23
24
24
25
/* special SNI prom calls */
···
72
71
#define SNI_IDPROM_SIZE 0x1000
73
72
74
73
#ifdef DEBUG
75
-
static void sni_idprom_dump(void)
74
+
static void __init sni_idprom_dump(void)
76
75
{
77
76
int i;
78
77
···
89
88
}
90
89
#endif
91
90
92
-
static void sni_mem_init(void )
91
+
static void __init sni_mem_init(void )
93
92
{
94
93
int i, memsize;
95
94
struct membank {
+1
-1
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+1
-1
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c