Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6caffe21 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 Matt Turner:
 "This contains some small clean up patches I've neglected, and some
  build improvements from Ben Hutchings"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: math-emu: Fix modular build
  alpha: Restore symbol versions for symbols exported from assembly
  alpha: defconfig: Cleanup from old Kconfig options
  alpha: use kobj_to_dev()
  alpha: squash lines for immediate return
  alpha: kernel: Use vma_pages()
  alpha: silence a buffer overflow warning
  alpha: marvel: make use of raw_spinlock variants
  alpha: cleanup: remove __NR_sys_epoll_*, leave __NR_epoll_*
  alpha: use generic fb.h
parents f32c9e05 d9e3cb2f

arch/alpha/defconfig

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_FILTER=m

CONFIG_VLAN_8021Q=m
@@ -57,7 +56,6 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_RTC=y

CONFIG_EXT2_FS=y

CONFIG_REISERFS_FS=m

CONFIG_AUTOFS_FS=m

CONFIG_ISO9660_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

arch/alpha/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
generic-y += clkdev.h

generic-y += exec.h

generic-y += export.h

generic-y += fb.h

generic-y += irq_work.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

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

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#include <linux/spinlock.h>



#include <asm/checksum.h>

#include <asm/console.h>

#include <asm/page.h>

#include <asm/string.h>

#include <asm/uaccess.h>



#include <asm-generic/asm-prototypes.h>



extern void __divl(void);

extern void __reml(void);

extern void __divq(void);

extern void __remq(void);

extern void __divlu(void);

extern void __remlu(void);

extern void __divqu(void);

extern void __remqu(void);

arch/alpha/include/asm/core_marvel.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ struct io7 { 
	io7_port7_csrs *csrs;

	struct io7_port ports[IO7_NUM_PORTS];



	spinlock_t irq_lock;

	raw_spinlock_t irq_lock;

};



#ifndef __EXTERN_INLINE

arch/alpha/include/asm/fb.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_

#include <linux/device.h>



/* Caching is off in the I/O space quadrant by design.  */

#define fb_pgprotect(...) do {} while (0)



static inline int fb_is_primary_device(struct fb_info *info)

{

	return 0;

}



#endif /* _ASM_FB_H_ */