Unified · Split
| @@ -1,6 +1,8 @@ | ||
| 1 | 1 | #ifndef _ALPHA_STATFS_H |
| 2 | 2 | #define _ALPHA_STATFS_H |
| 3 | 3 | |
| 4 | +#include <linux/types.h> | |
| 5 | + | |
| 4 | 6 | /* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't |
| 5 | 7 | even seem to implement statfs64 */ |
| 6 | 8 | #define __statfs_word __u32 |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef _ALPHA_SWAB_H |
| 2 | 2 | #define _ALPHA_SWAB_H |
| 3 | 3 | |
| 4 | −#include <asm/types.h> | |
| 4 | +#include <linux/types.h> | |
| 5 | 5 | #include <linux/compiler.h> |
| 6 | 6 | #include <asm/compiler.h> |
| 7 | 7 | |
| @@ -2,7 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | #define __ARM_A_OUT_H__ |
| 3 | 3 | |
| 4 | 4 | #include <linux/personality.h> |
| 5 | −#include <asm/types.h> | |
| 5 | +#include <linux/types.h> | |
| 6 | 6 | |
| 7 | 7 | struct exec |
| 8 | 8 | { |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #ifndef __ASMARM_SETUP_H |
| 15 | 15 | #define __ASMARM_SETUP_H |
| 16 | 16 | |
| 17 | −#include <asm/types.h> | |
| 17 | +#include <linux/types.h> | |
| 18 | 18 | |
| 19 | 19 | #define COMMAND_LINE_SIZE 1024 |
| 20 | 20 | |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #define __ASM_ARM_SWAB_H |
| 17 | 17 | |
| 18 | 18 | #include <linux/compiler.h> |
| 19 | −#include <asm/types.h> | |
| 19 | +#include <linux/types.h> | |
| 20 | 20 | |
| 21 | 21 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 22 | 22 | # define __SWAB_64_THRU_32__ |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | #ifndef __ASM_AVR32_SWAB_H |
| 5 | 5 | #define __ASM_AVR32_SWAB_H |
| 6 | 6 | |
| 7 | −#include <asm/types.h> | |
| 7 | +#include <linux/types.h> | |
| 8 | 8 | #include <linux/compiler.h> |
| 9 | 9 | |
| 10 | 10 | #define __SWAB_64_THRU_32__ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef _BLACKFIN_SWAB_H |
| 2 | 2 | #define _BLACKFIN_SWAB_H |
| 3 | 3 | |
| 4 | −#include <asm/types.h> | |
| 4 | +#include <linux/types.h> | |
| 5 | 5 | #include <linux/compiler.h> |
| 6 | 6 | |
| 7 | 7 | #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef _H8300_SWAB_H |
| 2 | 2 | #define _H8300_SWAB_H |
| 3 | 3 | |
| 4 | −#include <asm/types.h> | |
| 4 | +#include <linux/types.h> | |
| 5 | 5 | |
| 6 | 6 | #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 7 | 7 | # define __SWAB_64_THRU_32__ |
| @@ -6,8 +6,6 @@ · 5 unmodified lines | ||
| 6 | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#include <asm/types.h> | |
| 10 | − | |
| 11 | 9 | /* floating point status register: */ |
| 12 | 10 | #define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */ |
| 13 | 11 | #define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */ |
| @@ -6,6 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com> |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | +#include <linux/types.h> | |
| 9 | 10 | #include <linux/compiler.h> |
| 10 | 11 | |
| 11 | 12 | /* define this macro to get some asm stmts included in 'c' files */ |
| @@ -10,6 +10,7 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | #ifndef __ASSEMBLY__ |
| 12 | 12 | |
| 13 | +#include <linux/types.h> | |
| 13 | 14 | /* include compiler specific intrinsics */ |
| 14 | 15 | #include <asm/ia64regs.h> |
| 15 | 16 | #ifdef __INTEL_COMPILER |
| @@ -21,8 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | * |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | −#include <asm/types.h> | |
| 25 | − | |
| 24 | +#include <linux/types.h> | |
| 26 | 25 | #include <linux/ioctl.h> |
| 27 | 26 | |
| 28 | 27 | /* Architectural interrupt line count. */ |
| @@ -6,7 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co. |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#include <asm/types.h> | |
| 9 | +#include <linux/types.h> | |
| 10 | 10 | #include <asm/intrinsics.h> |
| 11 | 11 | #include <linux/compiler.h> |
| 12 | 12 | |
| @@ -9,6 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | #ifndef _ASM_SIGCONTEXT_H |
| 10 | 10 | #define _ASM_SIGCONTEXT_H |
| 11 | 11 | |
| 12 | +#include <linux/types.h> | |
| 12 | 13 | #include <asm/sgidefs.h> |
| 13 | 14 | |
| 14 | 15 | #if _MIPS_SIM == _MIPS_SIM_ABI32 |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | #define _ASM_SWAB_H |
| 10 | 10 | |
| 11 | 11 | #include <linux/compiler.h> |
| 12 | −#include <asm/types.h> | |
| 12 | +#include <linux/types.h> | |
| 13 | 13 | |
| 14 | 14 | #define __SWAB_64_THRU_32__ |
| 15 | 15 | |
| @@ -336,10 +336,11 @@ · 335 unmodified lines | ||
| 336 | 336 | #define NUM_PDC_RESULT 32 |
| 337 | 337 | |
| 338 | 338 | #if !defined(__ASSEMBLY__) |
| 339 | −#ifdef __KERNEL__ | |
| 340 | 339 | |
| 341 | 340 | #include <linux/types.h> |
| 342 | 341 | |
| 342 | +#ifdef __KERNEL__ | |
| 343 | + | |
| 343 | 344 | extern int pdc_type; |
| 344 | 345 | |
| 345 | 346 | /* Values for pdc_type */ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef _PARISC_SWAB_H |
| 2 | 2 | #define _PARISC_SWAB_H |
| 3 | 3 | |
| 4 | −#include <asm/types.h> | |
| 4 | +#include <linux/types.h> | |
| 5 | 5 | #include <linux/compiler.h> |
| 6 | 6 | |
| 7 | 7 | #define __SWAB_64_THRU_32__ |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | #ifndef __ASM_BOOTX_H__ |
| 10 | 10 | #define __ASM_BOOTX_H__ |
| 11 | 11 | |
| 12 | −#include <asm/types.h> | |
| 12 | +#include <linux/types.h> | |
| 13 | 13 | |
| 14 | 14 | #ifdef macintosh |
| 15 | 15 | #include <Types.h> |
| @@ -7,7 +7,7 @@ · 6 unmodified lines | ||
| 7 | 7 | #include <asm/string.h> |
| 8 | 8 | #endif |
| 9 | 9 | |
| 10 | −#include <asm/types.h> | |
| 10 | +#include <linux/types.h> | |
| 11 | 11 | #include <asm/ptrace.h> |
| 12 | 12 | #include <asm/cputable.h> |
| 13 | 13 | #include <asm/auxvec.h> |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #ifndef __LINUX_KVM_POWERPC_H |
| 21 | 21 | #define __LINUX_KVM_POWERPC_H |
| 22 | 22 | |
| 23 | −#include <asm/types.h> | |
| 23 | +#include <linux/types.h> | |
| 24 | 24 | |
| 25 | 25 | struct kvm_regs { |
| 26 | 26 | __u64 pc; |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #ifndef _ASM_POWERPC_PS3FB_H_ |
| 20 | 20 | #define _ASM_POWERPC_PS3FB_H_ |
| 21 | 21 | |
| 22 | +#include <linux/types.h> | |
| 22 | 23 | #include <linux/ioctl.h> |
| 23 | 24 | |
| 24 | 25 | /* ioctl */ |
| @@ -23,9 +23,10 @@ · 22 unmodified lines | ||
| 23 | 23 | #ifndef _SPU_INFO_H |
| 24 | 24 | #define _SPU_INFO_H |
| 25 | 25 | |
| 26 | +#include <linux/types.h> | |
| 27 | + | |
| 26 | 28 | #ifdef __KERNEL__ |
| 27 | 29 | #include <asm/spu.h> |
| 28 | −#include <linux/types.h> | |
| 29 | 30 | #else |
| 30 | 31 | struct mfc_cq_sr { |
| 31 | 32 | __u64 mfc_cq_data0_RW; |
| @@ -8,7 +8,7 @@ · 7 unmodified lines | ||
| 8 | 8 | * 2 of the License, or (at your option) any later version. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/types.h> | |
| 11 | +#include <linux/types.h> | |
| 12 | 12 | #include <linux/compiler.h> |
| 13 | 13 | |
| 14 | 14 | #ifdef __GNUC__ |
| @@ -7,21 +7,6 @@ · 6 unmodified lines | ||
| 7 | 7 | |
| 8 | 8 | #ifndef __ASSEMBLY__ |
| 9 | 9 | |
| 10 | −/* Interrupt control for vSMPowered x86_64 systems */ | |
| 11 | −void vsmp_init(void); | |
| 12 | − | |
| 13 | −void setup_bios_corruption_check(void); | |
| 14 | − | |
| 15 | −#ifdef CONFIG_X86_VISWS | |
| 16 | −extern void visws_early_detect(void); | |
| 17 | −extern int is_visws_box(void); | |
| 18 | −#else | |
| 19 | −static inline void visws_early_detect(void) { } | |
| 20 | −static inline int is_visws_box(void) { return 0; } | |
| 21 | −#endif | |
| 22 | − | |
| 23 | −extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip); | |
| 24 | −extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip); | |
| 25 | 10 | /* |
| 26 | 11 | * Any setup quirks to be performed? |
| 27 | 12 | */ |
| @@ -48,12 +33,6 @@ struct x86_quirks { · 20 unmodified lines | ||
| 48 | 33 | int (*update_genapic)(void); |
| 49 | 34 | }; |
| 50 | 35 | |
| 51 | −extern struct x86_quirks *x86_quirks; | |
| 52 | −extern unsigned long saved_video_mode; | |
| 53 | − | |
| 54 | −#ifndef CONFIG_PARAVIRT | |
| 55 | −#define paravirt_post_allocator_init() do {} while (0) | |
| 56 | −#endif | |
| 57 | 36 | #endif /* __ASSEMBLY__ */ |
| 58 | 37 | |
| 59 | 38 | #ifdef __i386__ |
| @@ -76,6 +55,28 @@ extern unsigned long saved_video_mode; · 16 unmodified lines | ||
| 76 | 55 | #ifndef __ASSEMBLY__ |
| 77 | 56 | #include <asm/bootparam.h> |
| 78 | 57 | |
| 58 | +/* Interrupt control for vSMPowered x86_64 systems */ | |
| 59 | +void vsmp_init(void); | |
| 60 | + | |
| 61 | +void setup_bios_corruption_check(void); | |
| 62 | + | |
| 63 | +#ifdef CONFIG_X86_VISWS | |
| 64 | +extern void visws_early_detect(void); | |
| 65 | +extern int is_visws_box(void); | |
| 66 | +#else | |
| 67 | +static inline void visws_early_detect(void) { } | |
| 68 | +static inline int is_visws_box(void) { return 0; } | |
| 69 | +#endif | |
| 70 | + | |
| 71 | +extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip); | |
| 72 | +extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip); | |
| 73 | +extern struct x86_quirks *x86_quirks; | |
| 74 | +extern unsigned long saved_video_mode; | |
| 75 | + | |
| 76 | +#ifndef CONFIG_PARAVIRT | |
| 77 | +#define paravirt_post_allocator_init() do {} while (0) | |
| 78 | +#endif | |
| 79 | + | |
| 79 | 80 | #ifndef _SETUP |
| 80 | 81 | |
| 81 | 82 | /* |
| @@ -74,6 +74,7 @@ asmlinkage long sys_vfork(struct pt_regs *); · 73 unmodified lines | ||
| 74 | 74 | asmlinkage long sys_execve(char __user *, char __user * __user *, |
| 75 | 75 | char __user * __user *, |
| 76 | 76 | struct pt_regs *); |
| 77 | +long sys_arch_prctl(int, unsigned long); | |
| 77 | 78 | |
| 78 | 79 | /* kernel/ioport.c */ |
| 79 | 80 | asmlinkage long sys_iopl(unsigned int, struct pt_regs *); |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #ifndef _XTENSA_SWAB_H |
| 12 | 12 | #define _XTENSA_SWAB_H |
| 13 | 13 | |
| 14 | −#include <asm/types.h> | |
| 14 | +#include <linux/types.h> | |
| 15 | 15 | #include <linux/compiler.h> |
| 16 | 16 | |
| 17 | 17 | #define __SWAB_64_THRU_32__ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef _ASM_SWAB_H |
| 2 | 2 | #define _ASM_SWAB_H |
| 3 | 3 | |
| 4 | −#include <asm/types.h> | |
| 4 | +#include <linux/types.h> | |
| 5 | 5 | |
| 6 | 6 | #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 7 | 7 | # define __SWAB_64_THRU_32__ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef _ASM_M32R_SWAB_H |
| 2 | 2 | #define _ASM_M32R_SWAB_H |
| 3 | 3 | |
| 4 | −#include <asm/types.h> | |
| 4 | +#include <linux/types.h> | |
| 5 | 5 | |
| 6 | 6 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 7 | 7 | # define __SWAB_64_THRU_32__ |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #ifndef _ASM_SWAB_H |
| 12 | 12 | #define _ASM_SWAB_H |
| 13 | 13 | |
| 14 | −#include <asm/types.h> | |
| 14 | +#include <linux/types.h> | |
| 15 | 15 | |
| 16 | 16 | #ifdef __GNUC__ |
| 17 | 17 | |
| @@ -6,6 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | #define CODA_PSDEV_MAJOR 67 |
| 7 | 7 | #define MAX_CODADEVS 5 /* how many do we allow */ |
| 8 | 8 | |
| 9 | +#ifdef __KERNEL__ | |
| 9 | 10 | struct kstatfs; |
| 10 | 11 | |
| 11 | 12 | /* communication pending/processing queues */ |
| @@ -24,7 +25,6 @@ static inline struct venus_comm *coda_vcp(struct super_block *sb) · 12 unmodified lines | ||
| 24 | 25 | return (struct venus_comm *)((sb)->s_fs_info); |
| 25 | 26 | } |
| 26 | 27 | |
| 27 | − | |
| 28 | 28 | /* upcalls */ |
| 29 | 29 | int venus_rootfid(struct super_block *sb, struct CodaFid *fidp); |
| 30 | 30 | 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); · 33 unmodified lines | ||
| 64 | 64 | int venus_fsync(struct super_block *sb, struct CodaFid *fid); |
| 65 | 65 | int venus_statfs(struct dentry *dentry, struct kstatfs *sfs); |
| 66 | 66 | |
| 67 | +/* | |
| 68 | + * Statistics | |
| 69 | + */ | |
| 70 | + | |
| 71 | +extern struct venus_comm coda_comms[]; | |
| 72 | +#endif /* __KERNEL__ */ | |
| 67 | 73 | |
| 68 | 74 | /* messages between coda filesystem in kernel and Venus */ |
| 69 | 75 | struct upc_req { |
| @@ -82,11 +88,4 @@ struct upc_req { · 12 unmodified lines | ||
| 82 | 88 | #define REQ_WRITE 0x4 |
| 83 | 89 | #define REQ_ABORT 0x8 |
| 84 | 90 | |
| 85 | − | |
| 86 | −/* | |
| 87 | − * Statistics | |
| 88 | − */ | |
| 89 | − | |
| 90 | −extern struct venus_comm coda_comms[]; | |
| 91 | − | |
| 92 | 91 | #endif |
| @@ -44,11 +44,11 @@ struct in6_addr · 43 unmodified lines | ||
| 44 | 44 | * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined |
| 45 | 45 | * in network byte order, not in host byte order as are the IPv4 equivalents |
| 46 | 46 | */ |
| 47 | +#ifdef __KERNEL__ | |
| 47 | 48 | extern const struct in6_addr in6addr_any; |
| 48 | 49 | #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } |
| 49 | 50 | extern const struct in6_addr in6addr_loopback; |
| 50 | 51 | #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } |
| 51 | −#ifdef __KERNEL__ | |
| 52 | 52 | extern const struct in6_addr in6addr_linklocal_allnodes; |
| 53 | 53 | #define IN6ADDR_LINKLOCAL_ALLNODES_INIT \ |
| 54 | 54 | { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } |
| @@ -237,6 +237,7 @@ struct nubus_dirent · 236 unmodified lines | ||
| 237 | 237 | int mask; |
| 238 | 238 | }; |
| 239 | 239 | |
| 240 | +#ifdef __KERNEL__ | |
| 240 | 241 | struct nubus_board { |
| 241 | 242 | struct nubus_board* next; |
| 242 | 243 | struct nubus_dev* first_dev; |
| @@ -351,6 +352,7 @@ void nubus_get_rsrc_mem(void* dest, · 108 unmodified lines | ||
| 351 | 352 | void nubus_get_rsrc_str(void* dest, |
| 352 | 353 | const struct nubus_dirent *dirent, |
| 353 | 354 | int maxlen); |
| 355 | +#endif /* __KERNEL__ */ | |
| 354 | 356 | |
| 355 | 357 | /* We'd like to get rid of this eventually. Only daynaport.c uses it now. */ |
| 356 | 358 | static inline void *nubus_slot_addr(int slot) |
| @@ -28,8 +28,6 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/reiserfs_fs_sb.h> |
| 29 | 29 | #endif |
| 30 | 30 | |
| 31 | −struct fid; | |
| 32 | − | |
| 33 | 31 | /* |
| 34 | 32 | * include/linux/reiser_fs.h |
| 35 | 33 | * |
| @@ -37,6 +35,33 @@ struct fid; · 1 unmodified line | ||
| 37 | 35 | * |
| 38 | 36 | */ |
| 39 | 37 | |
| 38 | +/* ioctl's command */ | |
| 39 | +#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long) | |
| 40 | +/* define following flags to be the same as in ext2, so that chattr(1), | |
| 41 | + lsattr(1) will work with us. */ | |
| 42 | +#define REISERFS_IOC_GETFLAGS FS_IOC_GETFLAGS | |
| 43 | +#define REISERFS_IOC_SETFLAGS FS_IOC_SETFLAGS | |
| 44 | +#define REISERFS_IOC_GETVERSION FS_IOC_GETVERSION | |
| 45 | +#define REISERFS_IOC_SETVERSION FS_IOC_SETVERSION | |
| 46 | + | |
| 47 | +#ifdef __KERNEL__ | |
| 48 | +/* the 32 bit compat definitions with int argument */ | |
| 49 | +#define REISERFS_IOC32_UNPACK _IOW(0xCD, 1, int) | |
| 50 | +#define REISERFS_IOC32_GETFLAGS FS_IOC32_GETFLAGS | |
| 51 | +#define REISERFS_IOC32_SETFLAGS FS_IOC32_SETFLAGS | |
| 52 | +#define REISERFS_IOC32_GETVERSION FS_IOC32_GETVERSION | |
| 53 | +#define REISERFS_IOC32_SETVERSION FS_IOC32_SETVERSION | |
| 54 | + | |
| 55 | +/* Locking primitives */ | |
| 56 | +/* Right now we are still falling back to (un)lock_kernel, but eventually that | |
| 57 | + would evolve into real per-fs locks */ | |
| 58 | +#define reiserfs_write_lock( sb ) lock_kernel() | |
| 59 | +#define reiserfs_write_unlock( sb ) unlock_kernel() | |
| 60 | + | |
| 61 | +/* xattr stuff */ | |
| 62 | +#define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem) | |
| 63 | +struct fid; | |
| 64 | + | |
| 40 | 65 | /* in reading the #defines, it may help to understand that they employ |
| 41 | 66 | the following abbreviations: |
| 42 | 67 | |
| @@ -698,6 +723,7 @@ static inline void cpu_key_k_offset_dec(struct cpu_key *key) · 655 unmodified lines | ||
| 698 | 723 | /* object identifier for root dir */ |
| 699 | 724 | #define REISERFS_ROOT_OBJECTID 2 |
| 700 | 725 | #define REISERFS_ROOT_PARENT_OBJECTID 1 |
| 726 | + | |
| 701 | 727 | extern struct reiserfs_key root_key; |
| 702 | 728 | |
| 703 | 729 | /* |
| @@ -1540,7 +1566,6 @@ struct reiserfs_iget_args { · 836 unmodified lines | ||
| 1540 | 1566 | /* FUNCTION DECLARATIONS */ |
| 1541 | 1567 | /***************************************************************************/ |
| 1542 | 1568 | |
| 1543 | −/*#ifdef __KERNEL__*/ | |
| 1544 | 1569 | #define get_journal_desc_magic(bh) (bh->b_data + bh->b_size - 12) |
| 1545 | 1570 | |
| 1546 | 1571 | #define journal_trans_half(blocksize) \ |
| @@ -2178,29 +2203,6 @@ long reiserfs_compat_ioctl(struct file *filp, · 631 unmodified lines | ||
| 2178 | 2203 | unsigned int cmd, unsigned long arg); |
| 2179 | 2204 | int reiserfs_unpack(struct inode *inode, struct file *filp); |
| 2180 | 2205 | |
| 2181 | −/* ioctl's command */ | |
| 2182 | −#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long) | |
| 2183 | −/* define following flags to be the same as in ext2, so that chattr(1), | |
| 2184 | − lsattr(1) will work with us. */ | |
| 2185 | −#define REISERFS_IOC_GETFLAGS FS_IOC_GETFLAGS | |
| 2186 | −#define REISERFS_IOC_SETFLAGS FS_IOC_SETFLAGS | |
| 2187 | −#define REISERFS_IOC_GETVERSION FS_IOC_GETVERSION | |
| 2188 | −#define REISERFS_IOC_SETVERSION FS_IOC_SETVERSION | |
| 2189 | − | |
| 2190 | −/* the 32 bit compat definitions with int argument */ | |
| 2191 | −#define REISERFS_IOC32_UNPACK _IOW(0xCD, 1, int) | |
| 2192 | −#define REISERFS_IOC32_GETFLAGS FS_IOC32_GETFLAGS | |
| 2193 | −#define REISERFS_IOC32_SETFLAGS FS_IOC32_SETFLAGS | |
| 2194 | −#define REISERFS_IOC32_GETVERSION FS_IOC32_GETVERSION | |
| 2195 | −#define REISERFS_IOC32_SETVERSION FS_IOC32_SETVERSION | |
| 2196 | − | |
| 2197 | −/* Locking primitives */ | |
| 2198 | −/* Right now we are still falling back to (un)lock_kernel, but eventually that | |
| 2199 | − would evolve into real per-fs locks */ | |
| 2200 | −#define reiserfs_write_lock( sb ) lock_kernel() | |
| 2201 | −#define reiserfs_write_unlock( sb ) unlock_kernel() | |
| 2202 | − | |
| 2203 | −/* xattr stuff */ | |
| 2204 | −#define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem) | |
| 2205 | 2206 | |
| 2207 | +#endif /* __KERNEL__ */ | |
| 2206 | 2208 | #endif /* _LINUX_REISER_FS_H */ |
| @@ -24,10 +24,12 @@ struct __kernel_sockaddr_storage { · 23 unmodified lines | ||
| 24 | 24 | #include <linux/types.h> /* pid_t */ |
| 25 | 25 | #include <linux/compiler.h> /* __user */ |
| 26 | 26 | |
| 27 | −#ifdef CONFIG_PROC_FS | |
| 27 | +#ifdef __KERNEL__ | |
| 28 | +# ifdef CONFIG_PROC_FS | |
| 28 | 29 | struct seq_file; |
| 29 | 30 | extern void socket_seq_show(struct seq_file *seq); |
| 30 | −#endif | |
| 31 | +# endif | |
| 32 | +#endif /* __KERNEL__ */ | |
| 31 | 33 | |
| 32 | 34 | typedef unsigned short sa_family_t; |
| 33 | 35 | |
| @@ -1,6 +1,9 @@ | ||
| 1 | 1 | #ifndef _LINUX_TYPES_H |
| 2 | 2 | #define _LINUX_TYPES_H |
| 3 | 3 | |
| 4 | +#include <asm/types.h> | |
| 5 | + | |
| 6 | +#ifndef __ASSEMBLY__ | |
| 4 | 7 | #ifdef __KERNEL__ |
| 5 | 8 | |
| 6 | 9 | #define DECLARE_BITMAP(name,bits) \ |
| @@ -9,7 +12,6 @@ · 2 unmodified lines | ||
| 9 | 12 | #endif |
| 10 | 13 | |
| 11 | 14 | #include <linux/posix_types.h> |
| 12 | −#include <asm/types.h> | |
| 13 | 15 | |
| 14 | 16 | #ifndef __KERNEL_STRICT_NAMES |
| 15 | 17 | |
| @@ -212,5 +214,5 @@ struct ustat { · 196 unmodified lines | ||
| 212 | 214 | }; |
| 213 | 215 | |
| 214 | 216 | #endif /* __KERNEL__ */ |
| 215 | − | |
| 217 | +#endif /* __ASSEMBLY__ */ | |
| 216 | 218 | #endif /* _LINUX_TYPES_H */ |
| @@ -38,7 +38,7 @@ foreach my $file (@files) { · 37 unmodified lines | ||
| 38 | 38 | &check_asm_types(); |
| 39 | 39 | &check_sizetypes(); |
| 40 | 40 | &check_prototypes(); |
| 41 | − &check_config(); | |
| 41 | + # Dropped for now. Too much noise &check_config(); | |
| 42 | 42 | } |
| 43 | 43 | close FH; |
| 44 | 44 | } |