Commit e534a583 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull alpha updates from Al Viro:
 "Mostly small janitorial fixes but there's also more important ones: a
  patch to fix loading large modules from Edward Humes, and some fixes
  from Al Viro"

[ The fixes from Al mostly came in separately through Al's trees too and
  are now duplicated..   - Linus ]

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: in_irq() cleanup
  alpha: lazy FPU switching
  alpha/boot/misc: trim unused declarations
  alpha/boot/tools/objstrip: fix the check for ELF header
  alpha/boot: fix the breakage from -isystem series...
  alpha: fix FEN fault handling
  alpha: Avoid comma separated statements
  alpha: fixed a typo in core_cia.c
  alpha: remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions
  alpha: update config files
  alpha: fix R_ALPHA_LITERAL reloc for large modules
  alpha: Add some spaces to ensure format specification
  alpha: replace NR_SYSCALLS by NR_syscalls
  alpha: Remove redundant local asm header redirections
  alpha: Implement "current_stack_pointer"
  alpha: remove redundant err variable
  alpha: osf_sys: reduce kernel log spamming on invalid osf_mount call typenr
parents cac85e46 290ec1d5

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config ALPHA 
	bool

	default y

	select ARCH_32BIT_USTAT_F_TINODE

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_NO_PREEMPT

arch/alpha/configs/defconfig

+0 −2
Original line number Diff line number Diff line
@@ -39,14 +39,12 @@ CONFIG_PATA_CYPRESS=y 
CONFIG_ATA_GENERIC=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_NET_ETHERNET=y

CONFIG_NET_VENDOR_3COM=y

CONFIG_VORTEX=y

CONFIG_NET_TULIP=y

CONFIG_DE2104X=m

CONFIG_TULIP=y

CONFIG_TULIP_MMIO=y

CONFIG_NET_PCI=y

CONFIG_YELLOWFIN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

arch/alpha/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


generated-y += syscall_table.h

generic-y += agp.h

generic-y += asm-offsets.h

generic-y += export.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

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

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <generated/asm-offsets.h>

arch/alpha/include/asm/div64.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/div64.h>