Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha

-2

arch/alpha/defconfig

··· 19 19 CONFIG_INET_ESP=m 20 20 # CONFIG_IPV6 is not set 21 21 CONFIG_NETFILTER=y 22 - CONFIG_IP_NF_QUEUE=m 23 22 CONFIG_IP_NF_IPTABLES=m 24 23 CONFIG_IP_NF_FILTER=m 25 24 CONFIG_VLAN_8021Q=m ··· 56 57 CONFIG_RTC=y 57 58 CONFIG_EXT2_FS=y 58 59 CONFIG_REISERFS_FS=m 59 - CONFIG_AUTOFS_FS=m 60 60 CONFIG_ISO9660_FS=y 61 61 CONFIG_MSDOS_FS=y 62 62 CONFIG_VFAT_FS=y

+1

arch/alpha/include/asm/Kbuild

··· 3 3 generic-y += clkdev.h 4 4 generic-y += exec.h 5 5 generic-y += export.h 6 + generic-y += fb.h 6 7 generic-y += irq_work.h 7 8 generic-y += mcs_spinlock.h 8 9 generic-y += mm-arch-hooks.h

+18

arch/alpha/include/asm/asm-prototypes.h

··· 1 + #include <linux/spinlock.h> 2 + 3 + #include <asm/checksum.h> 4 + #include <asm/console.h> 5 + #include <asm/page.h> 6 + #include <asm/string.h> 7 + #include <asm/uaccess.h> 8 + 9 + #include <asm-generic/asm-prototypes.h> 10 + 11 + extern void __divl(void); 12 + extern void __reml(void); 13 + extern void __divq(void); 14 + extern void __remq(void); 15 + extern void __divlu(void); 16 + extern void __remlu(void); 17 + extern void __divqu(void); 18 + extern void __remqu(void);

+1 -1

arch/alpha/include/asm/core_marvel.h

··· 312 312 io7_port7_csrs *csrs; 313 313 struct io7_port ports[IO7_NUM_PORTS]; 314 314 315 - spinlock_t irq_lock; 315 + raw_spinlock_t irq_lock; 316 316 }; 317 317 318 318 #ifndef __EXTERN_INLINE

-13

arch/alpha/include/asm/fb.h

··· 1 - #ifndef _ASM_FB_H_ 2 - #define _ASM_FB_H_ 3 - #include <linux/device.h> 4 - 5 - /* Caching is off in the I/O space quadrant by design. */ 6 - #define fb_pgprotect(...) do {} while (0) 7 - 8 - static inline int fb_is_primary_device(struct fb_info *info) 9 - { 10 - return 0; 11 - } 12 - 13 - #endif /* _ASM_FB_H_ */

-5

arch/alpha/include/uapi/asm/unistd.h

··· 366 366 #define __NR_epoll_create 407 367 367 #define __NR_epoll_ctl 408 368 368 #define __NR_epoll_wait 409 369 - /* Feb 2007: These three sys_epoll defines shouldn't be here but culling 370 - * them would break userspace apps ... we'll kill them off in 2010 :) */ 371 - #define __NR_sys_epoll_create __NR_epoll_create 372 - #define __NR_sys_epoll_ctl __NR_epoll_ctl 373 - #define __NR_sys_epoll_wait __NR_epoll_wait 374 369 #define __NR_remap_file_pages 410 375 370 #define __NR_set_tid_address 411 376 371 #define __NR_restart_syscall 412

+1 -1

arch/alpha/kernel/core_marvel.c

··· 118 118 119 119 io7 = alloc_bootmem(sizeof(*io7)); 120 120 io7->pe = pe; 121 - spin_lock_init(&io7->irq_lock); 121 + raw_spin_lock_init(&io7->irq_lock); 122 122 123 123 for (h = 0; h < 4; h++) { 124 124 io7->ports[h].io7 = io7;

+1 -5

arch/alpha/kernel/pci-noop.c

··· 42 42 struct resource * __init 43 43 alloc_resource(void) 44 44 { 45 - struct resource *res; 46 - 47 - res = alloc_bootmem(sizeof(*res)); 48 - 49 - return res; 45 + return alloc_bootmem(sizeof(struct resource)); 50 46 } 51 47 52 48 asmlinkage long

+3 -4

arch/alpha/kernel/pci-sysfs.c

··· 38 38 unsigned long nr, start, size; 39 39 int shift = sparse ? 5 : 0; 40 40 41 - nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 41 + nr = vma_pages(vma); 42 42 start = vma->vm_pgoff; 43 43 size = ((pci_resource_len(pdev, num) - 1) >> (PAGE_SHIFT - shift)) + 1; 44 44 ··· 64 64 struct bin_attribute *attr, 65 65 struct vm_area_struct *vma, int sparse) 66 66 { 67 - struct pci_dev *pdev = to_pci_dev(container_of(kobj, 68 - struct device, kobj)); 67 + struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj)); 69 68 struct resource *res = attr->private; 70 69 enum pci_mmap_state mmap_type; 71 70 struct pci_bus_region bar; ··· 254 255 { 255 256 unsigned long nr, start, size; 256 257 257 - nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 258 + nr = vma_pages(vma); 258 259 start = vma->vm_pgoff; 259 260 size = ((res_size - 1) >> PAGE_SHIFT) + 1; 260 261

+1 -5

arch/alpha/kernel/pci.c

··· 379 379 struct resource * __init 380 380 alloc_resource(void) 381 381 { 382 - struct resource *res; 383 - 384 - res = alloc_bootmem(sizeof(*res)); 385 - 386 - return res; 382 + return alloc_bootmem(sizeof(struct resource)); 387 383 } 388 384 389 385

+3 -2

arch/alpha/kernel/setup.c

··· 1094 1094 default: /* default to variation "0" for now */ 1095 1095 break; 1096 1096 case ST_DEC_EB164: 1097 - if (member < ARRAY_SIZE(eb164_indices)) 1098 - *variation_name = eb164_names[eb164_indices[member]]; 1097 + if (member >= ARRAY_SIZE(eb164_indices)) 1098 + break; 1099 + *variation_name = eb164_names[eb164_indices[member]]; 1099 1100 /* PC164 may show as EB164 variation, but with EV56 CPU, 1100 1101 so, since no true EB164 had anything but EV5... */ 1101 1102 if (eb164_indices[member] == 0 && cpu == EV56_CPU)

+2 -5

arch/alpha/kernel/smc37c669.c

··· 2007 2007 static unsigned char __init SMC37c669_read_config( 2008 2008 unsigned char index ) 2009 2009 { 2010 - unsigned char data; 2011 - 2012 - wb( &SMC37c669->index_port, index ); 2013 - data = rb( &SMC37c669->data_port ); 2014 - return data; 2010 + wb(&SMC37c669->index_port, index); 2011 + return rb(&SMC37c669->data_port); 2015 2012 } 2016 2013 2017 2014 /*

+6 -6

arch/alpha/kernel/sys_marvel.c

··· 115 115 return; 116 116 } 117 117 118 - spin_lock(&io7->irq_lock); 118 + raw_spin_lock(&io7->irq_lock); 119 119 *ctl |= 1UL << 24; 120 120 mb(); 121 121 *ctl; 122 - spin_unlock(&io7->irq_lock); 122 + raw_spin_unlock(&io7->irq_lock); 123 123 } 124 124 125 125 static void ··· 136 136 return; 137 137 } 138 138 139 - spin_lock(&io7->irq_lock); 139 + raw_spin_lock(&io7->irq_lock); 140 140 *ctl &= ~(1UL << 24); 141 141 mb(); 142 142 *ctl; 143 - spin_unlock(&io7->irq_lock); 143 + raw_spin_unlock(&io7->irq_lock); 144 144 } 145 145 146 146 static void ··· 263 263 */ 264 264 printk(" Interrupts reported to CPU at PE %u\n", boot_cpuid); 265 265 266 - spin_lock(&io7->irq_lock); 266 + raw_spin_lock(&io7->irq_lock); 267 267 268 268 /* set up the error irqs */ 269 269 io7_redirect_irq(io7, &io7->csrs->HLT_CTL.csr, boot_cpuid); ··· 295 295 for (i = 0; i < 16; ++i) 296 296 init_one_io7_msi(io7, i, boot_cpuid); 297 297 298 - spin_unlock(&io7->irq_lock); 298 + raw_spin_unlock(&io7->irq_lock); 299 299 } 300 300 301 301 static void __init

+2

arch/alpha/kernel/traps.c

··· 193 193 static long dummy_emul(void) { return 0; } 194 194 long (*alpha_fp_emul_imprecise)(struct pt_regs *regs, unsigned long writemask) 195 195 = (void *)dummy_emul; 196 + EXPORT_SYMBOL_GPL(alpha_fp_emul_imprecise); 196 197 long (*alpha_fp_emul) (unsigned long pc) 197 198 = (void *)dummy_emul; 199 + EXPORT_SYMBOL_GPL(alpha_fp_emul); 198 200 #else 199 201 long alpha_fp_emul_imprecise(struct pt_regs *regs, unsigned long writemask); 200 202 long alpha_fp_emul (unsigned long pc);

+1

arch/alpha/math-emu/math.c

··· 53 53 #ifdef MODULE 54 54 55 55 MODULE_DESCRIPTION("FP Software completion module"); 56 + MODULE_LICENSE("GPL v2"); 56 57 57 58 extern long (*alpha_fp_emul_imprecise)(struct pt_regs *, unsigned long); 58 59 extern long (*alpha_fp_emul) (unsigned long pc);