Skip to content

Commit

Permalink
Merge git://git.infradead.org/users/dwmw2/random-2.6
Browse files Browse the repository at this point in the history
* 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().
  • Loading branch information
Linus Torvalds committed Oct 13, 2008
2 parents e7f2f99 + e758936 commit 244dc4e
Show file tree
Hide file tree
Showing 57 changed files with 204 additions and 683 deletions.
4 changes: 1 addition & 3 deletions arch/alpha/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
config ALPHA
bool
default y
select HAVE_AOUT
select HAVE_IDE
select HAVE_OPROFILE
help
Expand Down Expand Up @@ -68,9 +69,6 @@ config AUTO_IRQ_AFFINITY
depends on SMP
default y

config ARCH_SUPPORTS_AOUT
def_bool y

source "init/Kconfig"


Expand Down
4 changes: 4 additions & 0 deletions arch/alpha/include/asm/statfs.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#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
4 changes: 1 addition & 3 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
34 changes: 2 additions & 32 deletions arch/arm/include/asm/statfs.h
Original file line number Diff line number Diff line change
@@ -1,42 +1,12 @@
#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
20 changes: 0 additions & 20 deletions arch/avr32/include/asm/a.out.h

This file was deleted.

19 changes: 0 additions & 19 deletions arch/blackfin/include/asm/a.out.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/cris/arch-v10/boot/tools/build.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <sys/sysmacros.h>
#include <unistd.h> /* contains read/write */
#include <fcntl.h>
#include <linux/a.out.h>
#include <errno.h>

#define MINIX_HEADER 32
Expand Down
3 changes: 0 additions & 3 deletions arch/h8300/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ config TIME_LOW_RES
bool
default y

config ARCH_SUPPORTS_AOUT
def_bool y

config NO_IOPORT
def_bool y

Expand Down
20 changes: 0 additions & 20 deletions arch/h8300/include/asm/a.out.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/h8300/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>
#include <linux/fs.h>
Expand Down
32 changes: 0 additions & 32 deletions arch/ia64/include/asm/a.out.h

This file was deleted.

52 changes: 5 additions & 47 deletions arch/ia64/include/asm/statfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,55 +8,13 @@
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
*/

#ifndef __KERNEL_STRICT_NAMES
# include <linux/types.h>
typedef __kernel_fsid_t fsid_t;
#endif

/*
* This is ugly --- we're already 64-bit, so just duplicate the definitions
* We need compat_statfs64 to be packed, because the i386 ABI won't
* add padding at the end to bring it to a multiple of 8 bytes, but
* the IA64 ABI will.
*/
struct statfs {
long f_type;
long f_bsize;
long f_blocks;
long f_bfree;
long f_bavail;
long f_files;
long f_ffree;
__kernel_fsid_t f_fsid;
long f_namelen;
long f_frsize;
long f_spare[5];
};


struct statfs64 {
long f_type;
long f_bsize;
long f_blocks;
long f_bfree;
long f_bavail;
long f_files;
long f_ffree;
__kernel_fsid_t f_fsid;
long f_namelen;
long f_frsize;
long f_spare[5];
};
#define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4)))

struct compat_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));
#include <asm-generic/statfs.h>

#endif /* _ASM_IA64_STATFS_H */
1 change: 0 additions & 1 deletion arch/ia64/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <linux/bitops.h>
#include <linux/kexec.h>

#include <asm/a.out.h>
#include <asm/dma.h>
#include <asm/ia32.h>
#include <asm/io.h>
Expand Down
3 changes: 0 additions & 3 deletions arch/m32r/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ config NO_IOPORT
config NO_DMA
def_bool y

config ARCH_SUPPORTS_AOUT
def_bool y

config HZ
int
default 100
Expand Down
4 changes: 1 addition & 3 deletions arch/m68k/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
config M68K
bool
default y
select HAVE_AOUT
select HAVE_IDE

config MMU
Expand Down Expand Up @@ -53,9 +54,6 @@ config NO_IOPORT
config NO_DMA
def_bool SUN3

config ARCH_SUPPORTS_AOUT
def_bool y

config HZ
int
default 100
Expand Down
3 changes: 0 additions & 3 deletions arch/m68knommu/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ config GENERIC_CLOCKEVENTS
config NO_IOPORT
def_bool y

config ARCH_SUPPORTS_AOUT
def_bool y

source "init/Kconfig"

menu "Processor type and features"
Expand Down
1 change: 0 additions & 1 deletion arch/m68knommu/include/asm/a.out.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/m68knommu/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>
#include <linux/fs.h>
Expand Down
1 change: 0 additions & 1 deletion arch/m68knommu/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/a.out.h>
#include <linux/user.h>
#include <linux/string.h>
#include <linux/linkage.h>
Expand Down
35 changes: 0 additions & 35 deletions arch/mips/include/asm/a.out.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/mips/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <linux/personality.h>
#include <linux/sys.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/init.h>
#include <linux/completion.h>
#include <linux/kallsyms.h>
Expand Down
1 change: 0 additions & 1 deletion arch/mips/kernel/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
* Copyright (C) 2001 MIPS Technologies, Inc.
*/
#include <linux/a.out.h>
#include <linux/capability.h>
#include <linux/errno.h>
#include <linux/linkage.h>
Expand Down
3 changes: 0 additions & 3 deletions arch/mn10300/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ config QUICKLIST
config ARCH_HAS_ILOG2_U32
def_bool y

config ARCH_SUPPORTS_AOUT
def_bool n

# Use the generic interrupt handling code in kernel/irq/
config GENERIC_HARDIRQS
def_bool y
Expand Down
Loading

0 comments on commit 244dc4e

Please sign in to comment.