diff options
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r-- | arch/alpha/kernel/osf_sys.c | 12 | ||||
-rw-r--r-- | arch/alpha/kernel/perf_event.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_alcor.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_cabriolet.c | 6 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_dp264.c | 8 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_eb64p.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_eiger.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_miata.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_mikasa.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_noritake.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_rawhide.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_ruffian.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_rx164.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_sable.c | 4 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_sio.c | 4 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_sx164.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_takara.c | 4 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_titan.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_wildfire.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/systbls.S | 2 |
23 files changed, 37 insertions, 35 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 326f0a2d56e..01e8715e26d 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
44 | #include <asm/sysinfo.h> | 44 | #include <asm/sysinfo.h> |
45 | #include <asm/thread_info.h> | ||
45 | #include <asm/hwrpb.h> | 46 | #include <asm/hwrpb.h> |
46 | #include <asm/processor.h> | 47 | #include <asm/processor.h> |
47 | 48 | ||
@@ -633,9 +634,10 @@ SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer, | |||
633 | case GSI_UACPROC: | 634 | case GSI_UACPROC: |
634 | if (nbytes < sizeof(unsigned int)) | 635 | if (nbytes < sizeof(unsigned int)) |
635 | return -EINVAL; | 636 | return -EINVAL; |
636 | w = (current_thread_info()->flags >> UAC_SHIFT) & UAC_BITMASK; | 637 | w = (current_thread_info()->flags >> ALPHA_UAC_SHIFT) & |
637 | if (put_user(w, (unsigned int __user *)buffer)) | 638 | UAC_BITMASK; |
638 | return -EFAULT; | 639 | if (put_user(w, (unsigned int __user *)buffer)) |
640 | return -EFAULT; | ||
639 | return 1; | 641 | return 1; |
640 | 642 | ||
641 | case GSI_PROC_TYPE: | 643 | case GSI_PROC_TYPE: |
@@ -756,8 +758,8 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer, | |||
756 | case SSIN_UACPROC: | 758 | case SSIN_UACPROC: |
757 | again: | 759 | again: |
758 | old = current_thread_info()->flags; | 760 | old = current_thread_info()->flags; |
759 | new = old & ~(UAC_BITMASK << UAC_SHIFT); | 761 | new = old & ~(UAC_BITMASK << ALPHA_UAC_SHIFT); |
760 | new = new | (w & UAC_BITMASK) << UAC_SHIFT; | 762 | new = new | (w & UAC_BITMASK) << ALPHA_UAC_SHIFT; |
761 | if (cmpxchg(¤t_thread_info()->flags, | 763 | if (cmpxchg(¤t_thread_info()->flags, |
762 | old, new) != old) | 764 | old, new) != old) |
763 | goto again; | 765 | goto again; |
diff --git a/arch/alpha/kernel/perf_event.c b/arch/alpha/kernel/perf_event.c index 8e47709160f..8143cd7cdbf 100644 --- a/arch/alpha/kernel/perf_event.c +++ b/arch/alpha/kernel/perf_event.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | 18 | ||
19 | #include <asm/hwrpb.h> | 19 | #include <asm/hwrpb.h> |
20 | #include <asm/atomic.h> | 20 | #include <linux/atomic.h> |
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/irq_regs.h> | 22 | #include <asm/irq_regs.h> |
23 | #include <asm/pal.h> | 23 | #include <asm/pal.h> |
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index d739703608f..4087a569b43 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | #include <asm/hwrpb.h> | 32 | #include <asm/hwrpb.h> |
33 | #include <asm/ptrace.h> | 33 | #include <asm/ptrace.h> |
34 | #include <asm/atomic.h> | 34 | #include <linux/atomic.h> |
35 | 35 | ||
36 | #include <asm/io.h> | 36 | #include <asm/io.h> |
37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c index 0e1439904cd..8606d77e516 100644 --- a/arch/alpha/kernel/sys_alcor.c +++ b/arch/alpha/kernel/sys_alcor.c | |||
@@ -183,7 +183,7 @@ alcor_init_irq(void) | |||
183 | */ | 183 | */ |
184 | 184 | ||
185 | static int __init | 185 | static int __init |
186 | alcor_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 186 | alcor_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
187 | { | 187 | { |
188 | static char irq_tab[7][5] __initdata = { | 188 | static char irq_tab[7][5] __initdata = { |
189 | /*INT INTA INTB INTC INTD */ | 189 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c index c8c112d5158..1029619fb6c 100644 --- a/arch/alpha/kernel/sys_cabriolet.c +++ b/arch/alpha/kernel/sys_cabriolet.c | |||
@@ -175,7 +175,7 @@ pc164_init_irq(void) | |||
175 | */ | 175 | */ |
176 | 176 | ||
177 | static inline int __init | 177 | static inline int __init |
178 | eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 178 | eb66p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
179 | { | 179 | { |
180 | static char irq_tab[5][5] __initdata = { | 180 | static char irq_tab[5][5] __initdata = { |
181 | /*INT INTA INTB INTC INTD */ | 181 | /*INT INTA INTB INTC INTD */ |
@@ -205,7 +205,7 @@ eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
205 | */ | 205 | */ |
206 | 206 | ||
207 | static inline int __init | 207 | static inline int __init |
208 | cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 208 | cabriolet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
209 | { | 209 | { |
210 | static char irq_tab[5][5] __initdata = { | 210 | static char irq_tab[5][5] __initdata = { |
211 | /*INT INTA INTB INTC INTD */ | 211 | /*INT INTA INTB INTC INTD */ |
@@ -289,7 +289,7 @@ cia_cab_init_pci(void) | |||
289 | */ | 289 | */ |
290 | 290 | ||
291 | static inline int __init | 291 | static inline int __init |
292 | alphapc164_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 292 | alphapc164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
293 | { | 293 | { |
294 | static char irq_tab[7][5] __initdata = { | 294 | static char irq_tab[7][5] __initdata = { |
295 | /*INT INTA INTB INTC INTD */ | 295 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c index f8856829c22..bb7f0c7cb17 100644 --- a/arch/alpha/kernel/sys_dp264.c +++ b/arch/alpha/kernel/sys_dp264.c | |||
@@ -382,7 +382,7 @@ isa_irq_fixup(struct pci_dev *dev, int irq) | |||
382 | } | 382 | } |
383 | 383 | ||
384 | static int __init | 384 | static int __init |
385 | dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 385 | dp264_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
386 | { | 386 | { |
387 | static char irq_tab[6][5] __initdata = { | 387 | static char irq_tab[6][5] __initdata = { |
388 | /*INT INTA INTB INTC INTD */ | 388 | /*INT INTA INTB INTC INTD */ |
@@ -404,7 +404,7 @@ dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
404 | } | 404 | } |
405 | 405 | ||
406 | static int __init | 406 | static int __init |
407 | monet_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 407 | monet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
408 | { | 408 | { |
409 | static char irq_tab[13][5] __initdata = { | 409 | static char irq_tab[13][5] __initdata = { |
410 | /*INT INTA INTB INTC INTD */ | 410 | /*INT INTA INTB INTC INTD */ |
@@ -466,7 +466,7 @@ monet_swizzle(struct pci_dev *dev, u8 *pinp) | |||
466 | } | 466 | } |
467 | 467 | ||
468 | static int __init | 468 | static int __init |
469 | webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 469 | webbrick_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
470 | { | 470 | { |
471 | static char irq_tab[13][5] __initdata = { | 471 | static char irq_tab[13][5] __initdata = { |
472 | /*INT INTA INTB INTC INTD */ | 472 | /*INT INTA INTB INTC INTD */ |
@@ -488,7 +488,7 @@ webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
488 | } | 488 | } |
489 | 489 | ||
490 | static int __init | 490 | static int __init |
491 | clipper_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 491 | clipper_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
492 | { | 492 | { |
493 | static char irq_tab[7][5] __initdata = { | 493 | static char irq_tab[7][5] __initdata = { |
494 | /*INT INTA INTB INTC INTD */ | 494 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c index a7a23b40eec..3c6c13cd8b1 100644 --- a/arch/alpha/kernel/sys_eb64p.c +++ b/arch/alpha/kernel/sys_eb64p.c | |||
@@ -169,7 +169,7 @@ eb64p_init_irq(void) | |||
169 | */ | 169 | */ |
170 | 170 | ||
171 | static int __init | 171 | static int __init |
172 | eb64p_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 172 | eb64p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
173 | { | 173 | { |
174 | static char irq_tab[5][5] __initdata = { | 174 | static char irq_tab[5][5] __initdata = { |
175 | /*INT INTA INTB INTC INTD */ | 175 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c index a60cd5b2621..35f480db771 100644 --- a/arch/alpha/kernel/sys_eiger.c +++ b/arch/alpha/kernel/sys_eiger.c | |||
@@ -144,7 +144,7 @@ eiger_init_irq(void) | |||
144 | } | 144 | } |
145 | 145 | ||
146 | static int __init | 146 | static int __init |
147 | eiger_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 147 | eiger_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
148 | { | 148 | { |
149 | u8 irq_orig; | 149 | u8 irq_orig; |
150 | 150 | ||
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 388b99d1779..95cfc83ece8 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c | |||
@@ -318,7 +318,7 @@ marvel_init_irq(void) | |||
318 | } | 318 | } |
319 | 319 | ||
320 | static int | 320 | static int |
321 | marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 321 | marvel_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
322 | { | 322 | { |
323 | struct pci_controller *hose = dev->sysdata; | 323 | struct pci_controller *hose = dev->sysdata; |
324 | struct io7_port *io7_port = hose->sysdata; | 324 | struct io7_port *io7_port = hose->sysdata; |
diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c index 61ccd95579e..258da684670 100644 --- a/arch/alpha/kernel/sys_miata.c +++ b/arch/alpha/kernel/sys_miata.c | |||
@@ -151,7 +151,7 @@ miata_init_irq(void) | |||
151 | */ | 151 | */ |
152 | 152 | ||
153 | static int __init | 153 | static int __init |
154 | miata_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 154 | miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
155 | { | 155 | { |
156 | static char irq_tab[18][5] __initdata = { | 156 | static char irq_tab[18][5] __initdata = { |
157 | /*INT INTA INTB INTC INTD */ | 157 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c index 0e6e4697a02..c0fd7284dec 100644 --- a/arch/alpha/kernel/sys_mikasa.c +++ b/arch/alpha/kernel/sys_mikasa.c | |||
@@ -146,7 +146,7 @@ mikasa_init_irq(void) | |||
146 | */ | 146 | */ |
147 | 147 | ||
148 | static int __init | 148 | static int __init |
149 | mikasa_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 149 | mikasa_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
150 | { | 150 | { |
151 | static char irq_tab[8][5] __initdata = { | 151 | static char irq_tab[8][5] __initdata = { |
152 | /*INT INTA INTB INTC INTD */ | 152 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 99c0f46f6b9..4112200307c 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c | |||
@@ -65,7 +65,7 @@ nautilus_init_irq(void) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | static int __init | 67 | static int __init |
68 | nautilus_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 68 | nautilus_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
69 | { | 69 | { |
70 | /* Preserve the IRQ set up by the console. */ | 70 | /* Preserve the IRQ set up by the console. */ |
71 | 71 | ||
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c index a00ac708716..21725283cdd 100644 --- a/arch/alpha/kernel/sys_noritake.c +++ b/arch/alpha/kernel/sys_noritake.c | |||
@@ -194,7 +194,7 @@ noritake_init_irq(void) | |||
194 | */ | 194 | */ |
195 | 195 | ||
196 | static int __init | 196 | static int __init |
197 | noritake_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 197 | noritake_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
198 | { | 198 | { |
199 | static char irq_tab[15][5] __initdata = { | 199 | static char irq_tab[15][5] __initdata = { |
200 | /*INT INTA INTB INTC INTD */ | 200 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c index 7f52161f3d8..a125d6bea7e 100644 --- a/arch/alpha/kernel/sys_rawhide.c +++ b/arch/alpha/kernel/sys_rawhide.c | |||
@@ -223,7 +223,7 @@ rawhide_init_irq(void) | |||
223 | */ | 223 | */ |
224 | 224 | ||
225 | static int __init | 225 | static int __init |
226 | rawhide_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 226 | rawhide_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
227 | { | 227 | { |
228 | static char irq_tab[5][5] __initdata = { | 228 | static char irq_tab[5][5] __initdata = { |
229 | /*INT INTA INTB INTC INTD */ | 229 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_ruffian.c b/arch/alpha/kernel/sys_ruffian.c index f33648e4e8c..2581cbec6fc 100644 --- a/arch/alpha/kernel/sys_ruffian.c +++ b/arch/alpha/kernel/sys_ruffian.c | |||
@@ -119,7 +119,7 @@ ruffian_kill_arch (int mode) | |||
119 | */ | 119 | */ |
120 | 120 | ||
121 | static int __init | 121 | static int __init |
122 | ruffian_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 122 | ruffian_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
123 | { | 123 | { |
124 | static char irq_tab[11][5] __initdata = { | 124 | static char irq_tab[11][5] __initdata = { |
125 | /*INT INTA INTB INTC INTD */ | 125 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c index 216d94d9c0c..b172b27555a 100644 --- a/arch/alpha/kernel/sys_rx164.c +++ b/arch/alpha/kernel/sys_rx164.c | |||
@@ -144,7 +144,7 @@ rx164_init_irq(void) | |||
144 | */ | 144 | */ |
145 | 145 | ||
146 | static int __init | 146 | static int __init |
147 | rx164_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 147 | rx164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
148 | { | 148 | { |
149 | #if 0 | 149 | #if 0 |
150 | static char irq_tab_pass1[6][5] __initdata = { | 150 | static char irq_tab_pass1[6][5] __initdata = { |
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c index da714e427c5..98d1dbffe98 100644 --- a/arch/alpha/kernel/sys_sable.c +++ b/arch/alpha/kernel/sys_sable.c | |||
@@ -194,7 +194,7 @@ sable_init_irq(void) | |||
194 | */ | 194 | */ |
195 | 195 | ||
196 | static int __init | 196 | static int __init |
197 | sable_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 197 | sable_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
198 | { | 198 | { |
199 | static char irq_tab[9][5] __initdata = { | 199 | static char irq_tab[9][5] __initdata = { |
200 | /*INT INTA INTB INTC INTD */ | 200 | /*INT INTA INTB INTC INTD */ |
@@ -376,7 +376,7 @@ lynx_init_irq(void) | |||
376 | */ | 376 | */ |
377 | 377 | ||
378 | static int __init | 378 | static int __init |
379 | lynx_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 379 | lynx_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
380 | { | 380 | { |
381 | static char irq_tab[19][5] __initdata = { | 381 | static char irq_tab[19][5] __initdata = { |
382 | /*INT INTA INTB INTC INTD */ | 382 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index 85b4aea01ef..47bec1e97d1 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c | |||
@@ -146,7 +146,7 @@ sio_fixup_irq_levels(unsigned int level_bits) | |||
146 | } | 146 | } |
147 | 147 | ||
148 | static inline int __init | 148 | static inline int __init |
149 | noname_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 149 | noname_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
150 | { | 150 | { |
151 | /* | 151 | /* |
152 | * The Noname board has 5 PCI slots with each of the 4 | 152 | * The Noname board has 5 PCI slots with each of the 4 |
@@ -185,7 +185,7 @@ noname_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | static inline int __init | 187 | static inline int __init |
188 | p2k_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 188 | p2k_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
189 | { | 189 | { |
190 | static char irq_tab[][5] __initdata = { | 190 | static char irq_tab[][5] __initdata = { |
191 | /*INT A B C D */ | 191 | /*INT A B C D */ |
diff --git a/arch/alpha/kernel/sys_sx164.c b/arch/alpha/kernel/sys_sx164.c index 41d4ad4c7c4..73e1c317afc 100644 --- a/arch/alpha/kernel/sys_sx164.c +++ b/arch/alpha/kernel/sys_sx164.c | |||
@@ -95,7 +95,7 @@ sx164_init_irq(void) | |||
95 | */ | 95 | */ |
96 | 96 | ||
97 | static int __init | 97 | static int __init |
98 | sx164_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 98 | sx164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
99 | { | 99 | { |
100 | static char irq_tab[5][5] __initdata = { | 100 | static char irq_tab[5][5] __initdata = { |
101 | /*INT INTA INTB INTC INTD */ | 101 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c index a31f8cd9bd6..2ae99ad6975 100644 --- a/arch/alpha/kernel/sys_takara.c +++ b/arch/alpha/kernel/sys_takara.c | |||
@@ -157,7 +157,7 @@ takara_init_irq(void) | |||
157 | */ | 157 | */ |
158 | 158 | ||
159 | static int __init | 159 | static int __init |
160 | takara_map_irq_srm(struct pci_dev *dev, u8 slot, u8 pin) | 160 | takara_map_irq_srm(const struct pci_dev *dev, u8 slot, u8 pin) |
161 | { | 161 | { |
162 | static char irq_tab[15][5] __initdata = { | 162 | static char irq_tab[15][5] __initdata = { |
163 | { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */ | 163 | { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */ |
@@ -188,7 +188,7 @@ takara_map_irq_srm(struct pci_dev *dev, u8 slot, u8 pin) | |||
188 | } | 188 | } |
189 | 189 | ||
190 | static int __init | 190 | static int __init |
191 | takara_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 191 | takara_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
192 | { | 192 | { |
193 | static char irq_tab[15][5] __initdata = { | 193 | static char irq_tab[15][5] __initdata = { |
194 | { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */ | 194 | { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */ |
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 6994407e242..f47b30a2a11 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c | |||
@@ -305,7 +305,7 @@ titan_late_init(void) | |||
305 | } | 305 | } |
306 | 306 | ||
307 | static int __devinit | 307 | static int __devinit |
308 | titan_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 308 | titan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
309 | { | 309 | { |
310 | u8 intline; | 310 | u8 intline; |
311 | int irq; | 311 | int irq; |
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c index d92cdc715c6..17c85a65e7b 100644 --- a/arch/alpha/kernel/sys_wildfire.c +++ b/arch/alpha/kernel/sys_wildfire.c | |||
@@ -290,7 +290,7 @@ wildfire_device_interrupt(unsigned long vector) | |||
290 | */ | 290 | */ |
291 | 291 | ||
292 | static int __init | 292 | static int __init |
293 | wildfire_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 293 | wildfire_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
294 | { | 294 | { |
295 | static char irq_tab[8][5] __initdata = { | 295 | static char irq_tab[8][5] __initdata = { |
296 | /*INT INTA INTB INTC INTD */ | 296 | /*INT INTA INTB INTC INTD */ |
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index b9c28f3f195..6acea1f96de 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S | |||
@@ -360,7 +360,7 @@ sys_call_table: | |||
360 | .quad sys_newuname | 360 | .quad sys_newuname |
361 | .quad sys_nanosleep /* 340 */ | 361 | .quad sys_nanosleep /* 340 */ |
362 | .quad sys_mremap | 362 | .quad sys_mremap |
363 | .quad sys_nfsservctl | 363 | .quad sys_ni_syscall /* old nfsservctl */ |
364 | .quad sys_setresuid | 364 | .quad sys_setresuid |
365 | .quad sys_getresuid | 365 | .quad sys_getresuid |
366 | .quad sys_pciconfig_read /* 345 */ | 366 | .quad sys_pciconfig_read /* 345 */ |