korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 05:55:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'tip/x86/headers' into x86/untangle2

Browse Source 
* commit 'tip/x86/headers': (42 commits)
  x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined
  unconditionally include asm/types.h from linux/types.h
  make linux/types.h as assembly safe
  Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
  headers_check fix cleanup: linux/reiserfs_fs.h
  headers_check fix cleanup: linux/nubus.h
  headers_check fix cleanup: linux/coda_psdev.h
  headers_check fix: x86, setup.h
  headers_check fix: x86, prctl.h
  headers_check fix: linux/reinserfs_fs.h
  headers_check fix: linux/socket.h
  headers_check fix: linux/nubus.h
  headers_check fix: linux/in6.h
  headers_check fix: linux/coda_psdev.h
  headers_check fix: xtensa, swab.h
  headers_check fix: powerpc, swab.h
  headers_check fix: powerpc, spu_info.h
  headers_check fix: powerpc, ps3fb.h
  headers_check fix: powerpc, kvm.h
  headers_check fix: powerpc, elf.h
  ...
This commit is contained in:
Jeremy Fitzhardinge 2009-02-13 12:53:17 -08:00
commit 8960f8c8e7
37 changed files with 101 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/include/asm/statfs.h
View File

@ -1,6 +1,8 @@
#ifndef _ALPHA_STATFS_H #ifndef _ALPHA_STATFS_H
#define _ALPHA_STATFS_H #define _ALPHA_STATFS_H
#include <linux/types.h>
/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't /* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't
even seem to implement statfs64 */ even seem to implement statfs64 */
#define __statfs_word __u32 #define __statfs_word __u32

2
arch/alpha/include/asm/swab.h
View File

@ -1,7 +1,7 @@
#ifndef _ALPHA_SWAB_H #ifndef _ALPHA_SWAB_H
#define _ALPHA_SWAB_H #define _ALPHA_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/compiler.h> #include <asm/compiler.h>

2
arch/arm/include/asm/a.out.h
View File

@ -2,7 +2,7 @@
#define __ARM_A_OUT_H__ #define __ARM_A_OUT_H__
#include <linux/personality.h> #include <linux/personality.h>
#include <asm/types.h> #include <linux/types.h>
struct exec struct exec
{ {

2
arch/arm/include/asm/setup.h
View File

@ -14,7 +14,7 @@
#ifndef __ASMARM_SETUP_H #ifndef __ASMARM_SETUP_H
#define __ASMARM_SETUP_H #define __ASMARM_SETUP_H
#include <asm/types.h> #include <linux/types.h>
#define COMMAND_LINE_SIZE 1024 #define COMMAND_LINE_SIZE 1024

2
arch/arm/include/asm/swab.h
View File

@ -16,7 +16,7 @@
#define __ASM_ARM_SWAB_H #define __ASM_ARM_SWAB_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/types.h> #include <linux/types.h>
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__ # define __SWAB_64_THRU_32__

2
arch/avr32/include/asm/swab.h
View File

@ -4,7 +4,7 @@
#ifndef __ASM_AVR32_SWAB_H #ifndef __ASM_AVR32_SWAB_H
#define __ASM_AVR32_SWAB_H #define __ASM_AVR32_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#define __SWAB_64_THRU_32__ #define __SWAB_64_THRU_32__

2
arch/blackfin/include/asm/swab.h
View File

@ -1,7 +1,7 @@
#ifndef _BLACKFIN_SWAB_H #ifndef _BLACKFIN_SWAB_H
#define _BLACKFIN_SWAB_H #define _BLACKFIN_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)

2
arch/h8300/include/asm/swab.h
View File

@ -1,7 +1,7 @@
#ifndef _H8300_SWAB_H #ifndef _H8300_SWAB_H
#define _H8300_SWAB_H #define _H8300_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__ # define __SWAB_64_THRU_32__

2
arch/ia64/include/asm/fpu.h
View File

@ -6,8 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
#include <asm/types.h>
/* floating point status register: */ /* floating point status register: */
#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */ #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */ #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */

1
arch/ia64/include/asm/gcc_intrin.h
View File

@ -6,6 +6,7 @@
* Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com> * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com>
*/ */
#include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* define this macro to get some asm stmts included in 'c' files */ /* define this macro to get some asm stmts included in 'c' files */

1
arch/ia64/include/asm/intrinsics.h
View File

@ -10,6 +10,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/types.h>
/* include compiler specific intrinsics */ /* include compiler specific intrinsics */
#include <asm/ia64regs.h> #include <asm/ia64regs.h>
#ifdef __INTEL_COMPILER #ifdef __INTEL_COMPILER

3
arch/ia64/include/asm/kvm.h
View File

@ -21,8 +21,7 @@
* *
*/ */
#include <asm/types.h> #include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
/* Architectural interrupt line count. */ /* Architectural interrupt line count. */

2
arch/ia64/include/asm/swab.h
View File

@ -6,7 +6,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co. * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
*/ */
#include <asm/types.h> #include <linux/types.h>
#include <asm/intrinsics.h> #include <asm/intrinsics.h>
#include <linux/compiler.h> #include <linux/compiler.h>

1
arch/mips/include/asm/sigcontext.h
View File

@ -9,6 +9,7 @@
#ifndef _ASM_SIGCONTEXT_H #ifndef _ASM_SIGCONTEXT_H
#define _ASM_SIGCONTEXT_H #define _ASM_SIGCONTEXT_H
#include <linux/types.h>
#include <asm/sgidefs.h> #include <asm/sgidefs.h>
#if _MIPS_SIM == _MIPS_SIM_ABI32 #if _MIPS_SIM == _MIPS_SIM_ABI32

2
arch/mips/include/asm/swab.h
View File

@ -9,7 +9,7 @@
#define _ASM_SWAB_H #define _ASM_SWAB_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/types.h> #include <linux/types.h>
#define __SWAB_64_THRU_32__ #define __SWAB_64_THRU_32__

3
arch/parisc/include/asm/pdc.h
View File

@ -336,10 +336,11 @@
#define NUM_PDC_RESULT 32 #define NUM_PDC_RESULT 32
#if !defined(__ASSEMBLY__) #if !defined(__ASSEMBLY__)
#ifdef __KERNEL__
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__
extern int pdc_type; extern int pdc_type;
/* Values for pdc_type */ /* Values for pdc_type */

2
arch/parisc/include/asm/swab.h
View File

@ -1,7 +1,7 @@
#ifndef _PARISC_SWAB_H #ifndef _PARISC_SWAB_H
#define _PARISC_SWAB_H #define _PARISC_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#define __SWAB_64_THRU_32__ #define __SWAB_64_THRU_32__

2
arch/powerpc/include/asm/bootx.h
View File

@ -9,7 +9,7 @@
#ifndef __ASM_BOOTX_H__ #ifndef __ASM_BOOTX_H__
#define __ASM_BOOTX_H__ #define __ASM_BOOTX_H__
#include <asm/types.h> #include <linux/types.h>
#ifdef macintosh #ifdef macintosh
#include <Types.h> #include <Types.h>

2
arch/powerpc/include/asm/elf.h
View File

@ -7,7 +7,7 @@
#include <asm/string.h> #include <asm/string.h>
#endif #endif
#include <asm/types.h> #include <linux/types.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/auxvec.h> #include <asm/auxvec.h>

2
arch/powerpc/include/asm/kvm.h
View File

@ -20,7 +20,7 @@
#ifndef __LINUX_KVM_POWERPC_H #ifndef __LINUX_KVM_POWERPC_H
#define __LINUX_KVM_POWERPC_H #define __LINUX_KVM_POWERPC_H
#include <asm/types.h> #include <linux/types.h>
struct kvm_regs { struct kvm_regs {
__u64 pc; __u64 pc;

1
arch/powerpc/include/asm/ps3fb.h
View File

@ -19,6 +19,7 @@
#ifndef _ASM_POWERPC_PS3FB_H_ #ifndef _ASM_POWERPC_PS3FB_H_
#define _ASM_POWERPC_PS3FB_H_ #define _ASM_POWERPC_PS3FB_H_
#include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
/* ioctl */ /* ioctl */

3
arch/powerpc/include/asm/spu_info.h
View File

@ -23,9 +23,10 @@
#ifndef _SPU_INFO_H #ifndef _SPU_INFO_H
#define _SPU_INFO_H #define _SPU_INFO_H
#include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/spu.h> #include <asm/spu.h>
#include <linux/types.h>
#else #else
struct mfc_cq_sr { struct mfc_cq_sr {
__u64 mfc_cq_data0_RW; __u64 mfc_cq_data0_RW;

2
arch/powerpc/include/asm/swab.h
View File

@ -8,7 +8,7 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#ifdef __GNUC__ #ifdef __GNUC__

2
arch/x86/include/asm/io.h
View File

@ -125,7 +125,7 @@ static inline void *phys_to_virt(phys_addr_t address)
/* /*
* ISA I/O bus memory addresses are 1:1 with the physical address. * ISA I/O bus memory addresses are 1:1 with the physical address.
*/ */
#define isa_virt_to_bus virt_to_phys #define isa_virt_to_bus (unsigned long)virt_to_phys
#define isa_page_to_bus page_to_phys #define isa_page_to_bus page_to_phys
#define isa_bus_to_virt phys_to_virt #define isa_bus_to_virt phys_to_virt

43
arch/x86/include/asm/setup.h
View File

@ -7,21 +7,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Interrupt control for vSMPowered x86_64 systems */
void vsmp_init(void);
void setup_bios_corruption_check(void);
#ifdef CONFIG_X86_VISWS
extern void visws_early_detect(void);
extern int is_visws_box(void);
#else
static inline void visws_early_detect(void) { }
static inline int is_visws_box(void) { return 0; }
#endif
extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
/* /*
* Any setup quirks to be performed? * Any setup quirks to be performed?
*/ */
@ -48,12 +33,6 @@ struct x86_quirks {
int (*update_genapic)(void); int (*update_genapic)(void);
}; };
extern struct x86_quirks *x86_quirks;
extern unsigned long saved_video_mode;
#ifndef CONFIG_PARAVIRT
#define paravirt_post_allocator_init() do {} while (0)
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef __i386__ #ifdef __i386__
@ -76,6 +55,28 @@ extern unsigned long saved_video_mode;
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/bootparam.h> #include <asm/bootparam.h>
/* Interrupt control for vSMPowered x86_64 systems */
void vsmp_init(void);
void setup_bios_corruption_check(void);
#ifdef CONFIG_X86_VISWS
extern void visws_early_detect(void);
extern int is_visws_box(void);
#else
static inline void visws_early_detect(void) { }
static inline int is_visws_box(void) { return 0; }
#endif
extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
extern struct x86_quirks *x86_quirks;
extern unsigned long saved_video_mode;
#ifndef CONFIG_PARAVIRT
#define paravirt_post_allocator_init() do {} while (0)
#endif
#ifndef _SETUP #ifndef _SETUP
/* /*

1
arch/x86/include/asm/syscalls.h
View File

@ -74,6 +74,7 @@ asmlinkage long sys_vfork(struct pt_regs *);
asmlinkage long sys_execve(char __user *, char __user * __user *, asmlinkage long sys_execve(char __user *, char __user * __user *,
char __user * __user *, char __user * __user *,
struct pt_regs *); struct pt_regs *);
long sys_arch_prctl(int, unsigned long);
/* kernel/ioport.c */ /* kernel/ioport.c */
asmlinkage long sys_iopl(unsigned int, struct pt_regs *); asmlinkage long sys_iopl(unsigned int, struct pt_regs *);

2
arch/xtensa/include/asm/swab.h
View File

@ -11,7 +11,7 @@
#ifndef _XTENSA_SWAB_H #ifndef _XTENSA_SWAB_H
#define _XTENSA_SWAB_H #define _XTENSA_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#define __SWAB_64_THRU_32__ #define __SWAB_64_THRU_32__

2
include/asm-frv/swab.h
View File

@ -1,7 +1,7 @@
#ifndef _ASM_SWAB_H #ifndef _ASM_SWAB_H
#define _ASM_SWAB_H #define _ASM_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__ # define __SWAB_64_THRU_32__

2
include/asm-m32r/swab.h
View File

@ -1,7 +1,7 @@
#ifndef _ASM_M32R_SWAB_H #ifndef _ASM_M32R_SWAB_H
#define _ASM_M32R_SWAB_H #define _ASM_M32R_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__ # define __SWAB_64_THRU_32__

2
include/asm-mn10300/swab.h
View File

@ -11,7 +11,7 @@
#ifndef _ASM_SWAB_H #ifndef _ASM_SWAB_H
#define _ASM_SWAB_H #define _ASM_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#ifdef __GNUC__ #ifdef __GNUC__

15
include/linux/coda_psdev.h
View File

@ -6,6 +6,7 @@
#define CODA_PSDEV_MAJOR 67 #define CODA_PSDEV_MAJOR 67
#define MAX_CODADEVS 5 /* how many do we allow */ #define MAX_CODADEVS 5 /* how many do we allow */
#ifdef __KERNEL__
struct kstatfs; struct kstatfs;
/* communication pending/processing queues */ /* communication pending/processing queues */
@ -24,7 +25,6 @@ static inline struct venus_comm *coda_vcp(struct super_block *sb)
return (struct venus_comm *)((sb)->s_fs_info); return (struct venus_comm *)((sb)->s_fs_info);
} }
/* upcalls */ /* upcalls */
int venus_rootfid(struct super_block *sb, struct CodaFid *fidp); int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);
int venus_getattr(struct super_block *sb, struct CodaFid *fid, int venus_getattr(struct super_block *sb, struct CodaFid *fid,
@ -64,6 +64,12 @@ int coda_downcall(int opcode, union outputArgs *out, struct super_block *sb);
int venus_fsync(struct super_block *sb, struct CodaFid *fid); int venus_fsync(struct super_block *sb, struct CodaFid *fid);
int venus_statfs(struct dentry *dentry, struct kstatfs *sfs); int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
/*
* Statistics
*/
extern struct venus_comm coda_comms[];
#endif /* __KERNEL__ */
/* messages between coda filesystem in kernel and Venus */ /* messages between coda filesystem in kernel and Venus */
struct upc_req { struct upc_req {
@ -82,11 +88,4 @@ struct upc_req {
#define REQ_WRITE 0x4 #define REQ_WRITE 0x4
#define REQ_ABORT 0x8 #define REQ_ABORT 0x8
/*
* Statistics
*/
extern struct venus_comm coda_comms[];
#endif #endif

2
include/linux/in6.h
View File

@ -44,11 +44,11 @@ struct in6_addr
* NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined
* in network byte order, not in host byte order as are the IPv4 equivalents * in network byte order, not in host byte order as are the IPv4 equivalents
*/ */
#ifdef __KERNEL__
extern const struct in6_addr in6addr_any; extern const struct in6_addr in6addr_any;
#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
extern const struct in6_addr in6addr_loopback; extern const struct in6_addr in6addr_loopback;
#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
#ifdef __KERNEL__
extern const struct in6_addr in6addr_linklocal_allnodes; extern const struct in6_addr in6addr_linklocal_allnodes;
#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \ #define IN6ADDR_LINKLOCAL_ALLNODES_INIT \
{ { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }

2
include/linux/nubus.h
View File

@ -237,6 +237,7 @@ struct nubus_dirent
int mask; int mask;
}; };
#ifdef __KERNEL__
struct nubus_board { struct nubus_board {
struct nubus_board* next; struct nubus_board* next;
struct nubus_dev* first_dev; struct nubus_dev* first_dev;
@ -351,6 +352,7 @@ void nubus_get_rsrc_mem(void* dest,
void nubus_get_rsrc_str(void* dest, void nubus_get_rsrc_str(void* dest,
const struct nubus_dirent *dirent, const struct nubus_dirent *dirent,
int maxlen); int maxlen);
#endif /* __KERNEL__ */
/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */ /* We'd like to get rid of this eventually. Only daynaport.c uses it now. */
static inline void *nubus_slot_addr(int slot) static inline void *nubus_slot_addr(int slot)

56
include/linux/reiserfs_fs.h
View File

@ -28,8 +28,6 @@
#include <linux/reiserfs_fs_sb.h> #include <linux/reiserfs_fs_sb.h>
#endif #endif
struct fid;
/* /*
* include/linux/reiser_fs.h * include/linux/reiser_fs.h
* *
@ -37,6 +35,33 @@ struct fid;
* *
*/ */
/* ioctl's command */
#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long)
/* define following flags to be the same as in ext2, so that chattr(1),
lsattr(1) will work with us. */
#define REISERFS_IOC_GETFLAGS FS_IOC_GETFLAGS
#define REISERFS_IOC_SETFLAGS FS_IOC_SETFLAGS
#define REISERFS_IOC_GETVERSION FS_IOC_GETVERSION
#define REISERFS_IOC_SETVERSION FS_IOC_SETVERSION
#ifdef __KERNEL__
/* the 32 bit compat definitions with int argument */
#define REISERFS_IOC32_UNPACK _IOW(0xCD, 1, int)
#define REISERFS_IOC32_GETFLAGS FS_IOC32_GETFLAGS
#define REISERFS_IOC32_SETFLAGS FS_IOC32_SETFLAGS
#define REISERFS_IOC32_GETVERSION FS_IOC32_GETVERSION
#define REISERFS_IOC32_SETVERSION FS_IOC32_SETVERSION
/* Locking primitives */
/* Right now we are still falling back to (un)lock_kernel, but eventually that
would evolve into real per-fs locks */
#define reiserfs_write_lock( sb ) lock_kernel()
#define reiserfs_write_unlock( sb ) unlock_kernel()
/* xattr stuff */
#define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem)
struct fid;
/* in reading the #defines, it may help to understand that they employ /* in reading the #defines, it may help to understand that they employ
the following abbreviations: the following abbreviations:
@ -698,6 +723,7 @@ static inline void cpu_key_k_offset_dec(struct cpu_key *key)
/* object identifier for root dir */ /* object identifier for root dir */
#define REISERFS_ROOT_OBJECTID 2 #define REISERFS_ROOT_OBJECTID 2
#define REISERFS_ROOT_PARENT_OBJECTID 1 #define REISERFS_ROOT_PARENT_OBJECTID 1
extern struct reiserfs_key root_key; extern struct reiserfs_key root_key;
/* /*
@ -1540,7 +1566,6 @@ struct reiserfs_iget_args {
/* FUNCTION DECLARATIONS */ /* FUNCTION DECLARATIONS */
/***************************************************************************/ /***************************************************************************/
/*#ifdef __KERNEL__*/
#define get_journal_desc_magic(bh) (bh->b_data + bh->b_size - 12) #define get_journal_desc_magic(bh) (bh->b_data + bh->b_size - 12)
#define journal_trans_half(blocksize) \ #define journal_trans_half(blocksize) \
@ -2178,29 +2203,6 @@ long reiserfs_compat_ioctl(struct file *filp,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
int reiserfs_unpack(struct inode *inode, struct file *filp); int reiserfs_unpack(struct inode *inode, struct file *filp);
/* ioctl's command */
#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long)
/* define following flags to be the same as in ext2, so that chattr(1),
lsattr(1) will work with us. */
#define REISERFS_IOC_GETFLAGS FS_IOC_GETFLAGS
#define REISERFS_IOC_SETFLAGS FS_IOC_SETFLAGS
#define REISERFS_IOC_GETVERSION FS_IOC_GETVERSION
#define REISERFS_IOC_SETVERSION FS_IOC_SETVERSION
/* the 32 bit compat definitions with int argument */
#define REISERFS_IOC32_UNPACK _IOW(0xCD, 1, int)
#define REISERFS_IOC32_GETFLAGS FS_IOC32_GETFLAGS
#define REISERFS_IOC32_SETFLAGS FS_IOC32_SETFLAGS
#define REISERFS_IOC32_GETVERSION FS_IOC32_GETVERSION
#define REISERFS_IOC32_SETVERSION FS_IOC32_SETVERSION
/* Locking primitives */
/* Right now we are still falling back to (un)lock_kernel, but eventually that
would evolve into real per-fs locks */
#define reiserfs_write_lock( sb ) lock_kernel()
#define reiserfs_write_unlock( sb ) unlock_kernel()
/* xattr stuff */
#define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem)
#endif /* __KERNEL__ */
#endif /* _LINUX_REISER_FS_H */ #endif /* _LINUX_REISER_FS_H */

6
include/linux/socket.h
View File

@ -24,10 +24,12 @@ struct __kernel_sockaddr_storage {
#include <linux/types.h> /* pid_t */ #include <linux/types.h> /* pid_t */
#include <linux/compiler.h> /* __user */ #include <linux/compiler.h> /* __user */
#ifdef CONFIG_PROC_FS #ifdef __KERNEL__
# ifdef CONFIG_PROC_FS
struct seq_file; struct seq_file;
extern void socket_seq_show(struct seq_file *seq); extern void socket_seq_show(struct seq_file *seq);
#endif # endif
#endif /* __KERNEL__ */
typedef unsigned short sa_family_t; typedef unsigned short sa_family_t;

6
include/linux/types.h
View File

@ -1,6 +1,9 @@
#ifndef _LINUX_TYPES_H #ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H #define _LINUX_TYPES_H
#include <asm/types.h>
#ifndef __ASSEMBLY__
#ifdef __KERNEL__ #ifdef __KERNEL__
#define DECLARE_BITMAP(name,bits) \ #define DECLARE_BITMAP(name,bits) \
@ -9,7 +12,6 @@
#endif #endif
#include <linux/posix_types.h> #include <linux/posix_types.h>
#include <asm/types.h>
#ifndef __KERNEL_STRICT_NAMES #ifndef __KERNEL_STRICT_NAMES
@ -212,5 +214,5 @@ struct ustat {
}; };
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */ #endif /* _LINUX_TYPES_H */

2
scripts/headers_check.pl
View File

@ -38,7 +38,7 @@ foreach my $file (@files) {
&check_asm_types(); &check_asm_types();
&check_sizetypes(); &check_sizetypes();
&check_prototypes(); &check_prototypes();
&check_config(); # Dropped for now. Too much noise &check_config();
} }
close FH; close FH;
} }