Commit 244dc4e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/dwmw2/random-2.6 

* git://git.infradead.org/users/dwmw2/random-2.6:
  Fix autoloading of MacBook Pro backlight driver.
  Automatic MODULE_ALIAS() for DMI match tables.
  Remove asm/a.out.h files for all architectures without a.out support.
  Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT
  Remove redundant CONFIG_ARCH_SUPPORTS_AOUT
  S390: Update comments about why we don't use <asm-generic/statfs.h>
  SPARC: Use <asm-generic/statfs.h>
  PowerPC: Use <asm-generic/statfs.h>
  PARISC: Use <asm-generic/statfs.h>
  x86_64: Use <asm-generic/statfs.h>
  IA64: Use <asm-generic/statfs.h>
  ARM: Use <asm-generic/statfs.h>
  Make <asm-generic/statfs.h> suitable for 64-bit platforms.
  Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver
  [MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ
  Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.
  EFS: Don't set f_fsid in statfs().
parents e7f2f991 e758936e

arch/alpha/Kconfig

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

	bool

	default y

	select HAVE_AOUT

	select HAVE_IDE

	select HAVE_OPROFILE

	help
@@ -68,9 +69,6 @@ config AUTO_IRQ_AFFINITY 
	depends on SMP

	default y



config ARCH_SUPPORTS_AOUT

	def_bool y



source "init/Kconfig"

arch/alpha/include/asm/statfs.h

+4 −0
Original line number Diff line number Diff line 
#ifndef _ALPHA_STATFS_H

#define _ALPHA_STATFS_H



/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't

   even seem to implement statfs64 */

#define __statfs_word __u32



#include <asm-generic/statfs.h>



#endif

arch/arm/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration" 
config ARM

	bool

	default y

	select HAVE_AOUT

	select HAVE_IDE

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION
@@ -140,9 +141,6 @@ config GENERIC_CALIBRATE_DELAY 
	bool

	default y



config ARCH_SUPPORTS_AOUT

	def_bool y



config ARCH_MAY_HAVE_PC_FDC

	bool

arch/arm/include/asm/statfs.h

+2 −32
Original line number Diff line number Diff line 
#ifndef _ASMARM_STATFS_H

#define _ASMARM_STATFS_H



#ifndef __KERNEL_STRICT_NAMES

# include <linux/types.h>

typedef __kernel_fsid_t	fsid_t;

#endif



struct statfs {

	__u32 f_type;

	__u32 f_bsize;

	__u32 f_blocks;

	__u32 f_bfree;

	__u32 f_bavail;

	__u32 f_files;

	__u32 f_ffree;

	__kernel_fsid_t f_fsid;

	__u32 f_namelen;

	__u32 f_frsize;

	__u32 f_spare[5];

};



/*

 * With EABI there is 4 bytes of padding added to this structure.

 * Let's pack it so the padding goes away to simplify dual ABI support.

 * Note that user space does NOT have to pack this structure.

 */

struct statfs64 {

	__u32 f_type;

	__u32 f_bsize;

	__u64 f_blocks;

	__u64 f_bfree;

	__u64 f_bavail;

	__u64 f_files;

	__u64 f_ffree;

	__kernel_fsid_t f_fsid;

	__u32 f_namelen;

	__u32 f_frsize;

	__u32 f_spare[5];

} __attribute__ ((packed,aligned(4)));

#define ARCH_PACK_STATFS64 __attribute__((packed,aligned(4)))



#include <asm-generic/statfs.h>

#endif

arch/avr32/include/asm/a.out.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_A_OUT_H

#define __ASM_AVR32_A_OUT_H



struct exec

{

  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */

  unsigned a_text;		/* length of text, in bytes */

  unsigned a_data;		/* length of data, in bytes */

  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */

  unsigned a_syms;		/* length of symbol table data in file, in bytes */

  unsigned a_entry;		/* start address */

  unsigned a_trsize;		/* length of relocation info for text, in bytes */

  unsigned a_drsize;		/* length of relocation info for data, in bytes */

};



#define N_TRSIZE(a)	((a).a_trsize)

#define N_DRSIZE(a)	((a).a_drsize)

#define N_SYMSIZE(a)	((a).a_syms)



#endif /* __ASM_AVR32_A_OUT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE