History

Merge branch 'core/header-fixes' into x86/headers

Ingo Molnar committed 17 years ago

Commit 22796b12 parents bf33a70 0fb807c36 files · +100 −86Browse files

Unified · Split

36 files
  1. arch/alpha/include/asm/statfs.h +2 −0
  2. arch/alpha/include/asm/swab.h +1 −1
  3. arch/arm/include/asm/a.out.h +1 −1
  4. arch/arm/include/asm/setup.h +1 −1
  5. arch/arm/include/asm/swab.h +1 −1
  6. arch/avr32/include/asm/swab.h +1 −1
  7. arch/blackfin/include/asm/swab.h +1 −1
  8. arch/h8300/include/asm/swab.h +1 −1
  9. arch/ia64/include/asm/fpu.h +0 −2
  10. arch/ia64/include/asm/gcc_intrin.h +1 −0
  11. arch/ia64/include/asm/intrinsics.h +1 −0
  12. arch/ia64/include/asm/kvm.h +1 −2
  13. arch/ia64/include/asm/swab.h +1 −1
  14. arch/mips/include/asm/sigcontext.h +1 −0
  15. arch/mips/include/asm/swab.h +1 −1
  16. arch/parisc/include/asm/pdc.h +2 −1
  17. arch/parisc/include/asm/swab.h +1 −1
  18. arch/powerpc/include/asm/bootx.h +1 −1
  19. arch/powerpc/include/asm/elf.h +1 −1
  20. arch/powerpc/include/asm/kvm.h +1 −1
  21. arch/powerpc/include/asm/ps3fb.h +1 −0
  22. arch/powerpc/include/asm/spu_info.h +2 −1
  23. arch/powerpc/include/asm/swab.h +1 −1
  24. arch/x86/include/asm/setup.h +22 −21
  25. arch/x86/include/asm/syscalls.h +1 −0
  26. arch/xtensa/include/asm/swab.h +1 −1
  27. include/asm-frv/swab.h +1 −1
  28. include/asm-m32r/swab.h +1 −1
  29. include/asm-mn10300/swab.h +1 −1
  30. include/linux/coda_psdev.h +7 −8
  31. include/linux/in6.h +1 −1
  32. include/linux/nubus.h +2 −0
  33. include/linux/reiserfs_fs.h +29 −27
  34. include/linux/socket.h +4 −2
  35. include/linux/types.h +4 −2
  36. scripts/headers_check.pl +1 −1
arch/alpha/include/asm/statfs.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _ALPHA_STATFS_H1#ifndef _ALPHA_STATFS_H
2#define _ALPHA_STATFS_H2#define _ALPHA_STATFS_H
3 3
4#include <linux/types.h>
5
4/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't6/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't
5 even seem to implement statfs64 */7 even seem to implement statfs64 */
6#define __statfs_word __u328#define __statfs_word __u32
arch/alpha/include/asm/swab.h+1−1
@@ -1,7 +1,7 @@
1#ifndef _ALPHA_SWAB_H1#ifndef _ALPHA_SWAB_H
2#define _ALPHA_SWAB_H2#define _ALPHA_SWAB_H
3 3
4#include <asm/types.h>4#include <linux/types.h>
5#include <linux/compiler.h>5#include <linux/compiler.h>
6#include <asm/compiler.h>6#include <asm/compiler.h>
7 7
arch/arm/include/asm/a.out.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2#define __ARM_A_OUT_H__2#define __ARM_A_OUT_H__
3 3
4#include <linux/personality.h>4#include <linux/personality.h>
5#include <asm/types.h>5#include <linux/types.h>
6 6
7struct exec7struct exec
8{8{
arch/arm/include/asm/setup.h+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
14#ifndef __ASMARM_SETUP_H14#ifndef __ASMARM_SETUP_H
15#define __ASMARM_SETUP_H15#define __ASMARM_SETUP_H
16 16
17#include <asm/types.h>17#include <linux/types.h>
18 18
19#define COMMAND_LINE_SIZE 102419#define COMMAND_LINE_SIZE 1024
20 20
arch/arm/include/asm/swab.h+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
16#define __ASM_ARM_SWAB_H16#define __ASM_ARM_SWAB_H
17 17
18#include <linux/compiler.h>18#include <linux/compiler.h>
19#include <asm/types.h>19#include <linux/types.h>
20 20
21#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)21#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
22# define __SWAB_64_THRU_32__22# define __SWAB_64_THRU_32__
arch/avr32/include/asm/swab.h+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
4#ifndef __ASM_AVR32_SWAB_H4#ifndef __ASM_AVR32_SWAB_H
5#define __ASM_AVR32_SWAB_H5#define __ASM_AVR32_SWAB_H
6 6
7#include <asm/types.h>7#include <linux/types.h>
8#include <linux/compiler.h>8#include <linux/compiler.h>
9 9
10#define __SWAB_64_THRU_32__10#define __SWAB_64_THRU_32__
arch/blackfin/include/asm/swab.h+1−1
@@ -1,7 +1,7 @@
1#ifndef _BLACKFIN_SWAB_H1#ifndef _BLACKFIN_SWAB_H
2#define _BLACKFIN_SWAB_H2#define _BLACKFIN_SWAB_H
3 3
4#include <asm/types.h>4#include <linux/types.h>
5#include <linux/compiler.h>5#include <linux/compiler.h>
6 6
7#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)7#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
arch/h8300/include/asm/swab.h+1−1
@@ -1,7 +1,7 @@
1#ifndef _H8300_SWAB_H1#ifndef _H8300_SWAB_H
2#define _H8300_SWAB_H2#define _H8300_SWAB_H
3 3
4#include <asm/types.h>4#include <linux/types.h>
5 5
6#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)6#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
7# define __SWAB_64_THRU_32__7# define __SWAB_64_THRU_32__
arch/ia64/include/asm/fpu.h+0−2
@@ -6,8 +6,6 @@ · 5 unmodified lines
6 * David Mosberger-Tang <davidm@hpl.hp.com>6 * David Mosberger-Tang <davidm@hpl.hp.com>
7 */7 */
8 8
9#include <asm/types.h>
10
11/* floating point status register: */9/* floating point status register: */
12#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */10#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
13#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */11#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */
arch/ia64/include/asm/gcc_intrin.h+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
6 * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com>6 * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com>
7 */7 */
8 8
9#include <linux/types.h>
9#include <linux/compiler.h>10#include <linux/compiler.h>
10 11
11/* define this macro to get some asm stmts included in 'c' files */12/* define this macro to get some asm stmts included in 'c' files */
arch/ia64/include/asm/intrinsics.h+1−0
@@ -10,6 +10,7 @@ · 9 unmodified lines
10 10
11#ifndef __ASSEMBLY__11#ifndef __ASSEMBLY__
12 12
13#include <linux/types.h>
13/* include compiler specific intrinsics */14/* include compiler specific intrinsics */
14#include <asm/ia64regs.h>15#include <asm/ia64regs.h>
15#ifdef __INTEL_COMPILER16#ifdef __INTEL_COMPILER
arch/ia64/include/asm/kvm.h+1−2
@@ -21,8 +21,7 @@ · 20 unmodified lines
21 *21 *
22 */22 */
23 23
24#include <asm/types.h>24#include <linux/types.h>
25
26#include <linux/ioctl.h>25#include <linux/ioctl.h>
27 26
28/* Architectural interrupt line count. */27/* Architectural interrupt line count. */
arch/ia64/include/asm/swab.h+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
6 * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.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#include <asm/intrinsics.h>10#include <asm/intrinsics.h>
11#include <linux/compiler.h>11#include <linux/compiler.h>
12 12
arch/mips/include/asm/sigcontext.h+1−0
@@ -9,6 +9,7 @@ · 8 unmodified lines
9#ifndef _ASM_SIGCONTEXT_H9#ifndef _ASM_SIGCONTEXT_H
10#define _ASM_SIGCONTEXT_H10#define _ASM_SIGCONTEXT_H
11 11
12#include <linux/types.h>
12#include <asm/sgidefs.h>13#include <asm/sgidefs.h>
13 14
14#if _MIPS_SIM == _MIPS_SIM_ABI3215#if _MIPS_SIM == _MIPS_SIM_ABI32
arch/mips/include/asm/swab.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9#define _ASM_SWAB_H9#define _ASM_SWAB_H
10 10
11#include <linux/compiler.h>11#include <linux/compiler.h>
12#include <asm/types.h>12#include <linux/types.h>
13 13
14#define __SWAB_64_THRU_32__14#define __SWAB_64_THRU_32__
15 15
arch/parisc/include/asm/pdc.h+2−1
@@ -336,10 +336,11 @@ · 335 unmodified lines
336#define NUM_PDC_RESULT 32336#define NUM_PDC_RESULT 32
337 337
338#if !defined(__ASSEMBLY__)338#if !defined(__ASSEMBLY__)
339#ifdef __KERNEL__
340 339
341#include <linux/types.h>340#include <linux/types.h>
342 341
342#ifdef __KERNEL__
343
343extern int pdc_type;344extern int pdc_type;
344 345
345/* Values for pdc_type */346/* Values for pdc_type */
arch/parisc/include/asm/swab.h+1−1
@@ -1,7 +1,7 @@
1#ifndef _PARISC_SWAB_H1#ifndef _PARISC_SWAB_H
2#define _PARISC_SWAB_H2#define _PARISC_SWAB_H
3 3
4#include <asm/types.h>4#include <linux/types.h>
5#include <linux/compiler.h>5#include <linux/compiler.h>
6 6
7#define __SWAB_64_THRU_32__7#define __SWAB_64_THRU_32__
arch/powerpc/include/asm/bootx.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9#ifndef __ASM_BOOTX_H__9#ifndef __ASM_BOOTX_H__
10#define __ASM_BOOTX_H__10#define __ASM_BOOTX_H__
11 11
12#include <asm/types.h>12#include <linux/types.h>
13 13
14#ifdef macintosh14#ifdef macintosh
15#include <Types.h>15#include <Types.h>
arch/powerpc/include/asm/elf.h+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
7#include <asm/string.h>7#include <asm/string.h>
8#endif8#endif
9 9
10#include <asm/types.h>10#include <linux/types.h>
11#include <asm/ptrace.h>11#include <asm/ptrace.h>
12#include <asm/cputable.h>12#include <asm/cputable.h>
13#include <asm/auxvec.h>13#include <asm/auxvec.h>
arch/powerpc/include/asm/kvm.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
20#ifndef __LINUX_KVM_POWERPC_H20#ifndef __LINUX_KVM_POWERPC_H
21#define __LINUX_KVM_POWERPC_H21#define __LINUX_KVM_POWERPC_H
22 22
23#include <asm/types.h>23#include <linux/types.h>
24 24
25struct kvm_regs {25struct kvm_regs {
26 __u64 pc;26 __u64 pc;
arch/powerpc/include/asm/ps3fb.h+1−0
@@ -19,6 +19,7 @@ · 18 unmodified lines
19#ifndef _ASM_POWERPC_PS3FB_H_19#ifndef _ASM_POWERPC_PS3FB_H_
20#define _ASM_POWERPC_PS3FB_H_20#define _ASM_POWERPC_PS3FB_H_
21 21
22#include <linux/types.h>
22#include <linux/ioctl.h>23#include <linux/ioctl.h>
23 24
24/* ioctl */25/* ioctl */
arch/powerpc/include/asm/spu_info.h+2−1
@@ -23,9 +23,10 @@ · 22 unmodified lines
23#ifndef _SPU_INFO_H23#ifndef _SPU_INFO_H
24#define _SPU_INFO_H24#define _SPU_INFO_H
25 25
26#include <linux/types.h>
27
26#ifdef __KERNEL__28#ifdef __KERNEL__
27#include <asm/spu.h>29#include <asm/spu.h>
28#include <linux/types.h>
29#else30#else
30struct mfc_cq_sr {31struct mfc_cq_sr {
31 __u64 mfc_cq_data0_RW;32 __u64 mfc_cq_data0_RW;
arch/powerpc/include/asm/swab.h+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
8 * 2 of the License, or (at your option) any later version.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#include <linux/compiler.h>12#include <linux/compiler.h>
13 13
14#ifdef __GNUC__14#ifdef __GNUC__
arch/x86/include/asm/setup.h+22−21
@@ -7,21 +7,6 @@ · 6 unmodified lines
7 7
8#ifndef __ASSEMBLY__8#ifndef __ASSEMBLY__
9 9
10/* Interrupt control for vSMPowered x86_64 systems */
11void vsmp_init(void);
12
13void setup_bios_corruption_check(void);
14
15#ifdef CONFIG_X86_VISWS
16extern void visws_early_detect(void);
17extern int is_visws_box(void);
18#else
19static inline void visws_early_detect(void) { }
20static inline int is_visws_box(void) { return 0; }
21#endif
22
23extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
24extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
25/*10/*
26 * Any setup quirks to be performed?11 * Any setup quirks to be performed?
27 */12 */
@@ -48,12 +33,6 @@ struct x86_quirks { · 20 unmodified lines
48 int (*update_genapic)(void);33 int (*update_genapic)(void);
49};34};
50 35
51extern struct x86_quirks *x86_quirks;
52extern unsigned long saved_video_mode;
53
54#ifndef CONFIG_PARAVIRT
55#define paravirt_post_allocator_init() do {} while (0)
56#endif
57#endif /* __ASSEMBLY__ */36#endif /* __ASSEMBLY__ */
58 37
59#ifdef __i386__38#ifdef __i386__
@@ -76,6 +55,28 @@ extern unsigned long saved_video_mode; · 16 unmodified lines
76#ifndef __ASSEMBLY__55#ifndef __ASSEMBLY__
77#include <asm/bootparam.h>56#include <asm/bootparam.h>
78 57
58/* Interrupt control for vSMPowered x86_64 systems */
59void vsmp_init(void);
60
61void setup_bios_corruption_check(void);
62
63#ifdef CONFIG_X86_VISWS
64extern void visws_early_detect(void);
65extern int is_visws_box(void);
66#else
67static inline void visws_early_detect(void) { }
68static inline int is_visws_box(void) { return 0; }
69#endif
70
71extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
72extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
73extern struct x86_quirks *x86_quirks;
74extern unsigned long saved_video_mode;
75
76#ifndef CONFIG_PARAVIRT
77#define paravirt_post_allocator_init() do {} while (0)
78#endif
79
79#ifndef _SETUP80#ifndef _SETUP
80 81
81/*82/*
arch/x86/include/asm/syscalls.h+1−0
@@ -74,6 +74,7 @@ asmlinkage long sys_vfork(struct pt_regs *); · 73 unmodified lines
74asmlinkage long sys_execve(char __user *, char __user * __user *,74asmlinkage long sys_execve(char __user *, char __user * __user *,
75 char __user * __user *,75 char __user * __user *,
76 struct pt_regs *);76 struct pt_regs *);
77long sys_arch_prctl(int, unsigned long);
77 78
78/* kernel/ioport.c */79/* kernel/ioport.c */
79asmlinkage long sys_iopl(unsigned int, struct pt_regs *);80asmlinkage long sys_iopl(unsigned int, struct pt_regs *);
arch/xtensa/include/asm/swab.h+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
11#ifndef _XTENSA_SWAB_H11#ifndef _XTENSA_SWAB_H
12#define _XTENSA_SWAB_H12#define _XTENSA_SWAB_H
13 13
14#include <asm/types.h>14#include <linux/types.h>
15#include <linux/compiler.h>15#include <linux/compiler.h>
16 16
17#define __SWAB_64_THRU_32__17#define __SWAB_64_THRU_32__
include/asm-frv/swab.h+1−1
@@ -1,7 +1,7 @@
1#ifndef _ASM_SWAB_H1#ifndef _ASM_SWAB_H
2#define _ASM_SWAB_H2#define _ASM_SWAB_H
3 3
4#include <asm/types.h>4#include <linux/types.h>
5 5
6#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)6#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
7# define __SWAB_64_THRU_32__7# define __SWAB_64_THRU_32__
include/asm-m32r/swab.h+1−1
@@ -1,7 +1,7 @@
1#ifndef _ASM_M32R_SWAB_H1#ifndef _ASM_M32R_SWAB_H
2#define _ASM_M32R_SWAB_H2#define _ASM_M32R_SWAB_H
3 3
4#include <asm/types.h>4#include <linux/types.h>
5 5
6#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)6#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
7# define __SWAB_64_THRU_32__7# define __SWAB_64_THRU_32__
include/asm-mn10300/swab.h+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
11#ifndef _ASM_SWAB_H11#ifndef _ASM_SWAB_H
12#define _ASM_SWAB_H12#define _ASM_SWAB_H
13 13
14#include <asm/types.h>14#include <linux/types.h>
15 15
16#ifdef __GNUC__16#ifdef __GNUC__
17 17
include/linux/coda_psdev.h+7−8
@@ -6,6 +6,7 @@ · 5 unmodified lines
6#define CODA_PSDEV_MAJOR 676#define CODA_PSDEV_MAJOR 67
7#define MAX_CODADEVS 5 /* how many do we allow */7#define MAX_CODADEVS 5 /* how many do we allow */
8 8
9#ifdef __KERNEL__
9struct kstatfs;10struct kstatfs;
10 11
11/* communication pending/processing queues */12/* communication pending/processing queues */
@@ -24,7 +25,6 @@ static inline struct venus_comm *coda_vcp(struct super_block *sb) · 12 unmodified lines
24 return (struct venus_comm *)((sb)->s_fs_info);25 return (struct venus_comm *)((sb)->s_fs_info);
25}26}
26 27
27
28/* upcalls */28/* upcalls */
29int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);29int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);
30int venus_getattr(struct super_block *sb, struct CodaFid *fid,30int 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
64int venus_fsync(struct super_block *sb, struct CodaFid *fid);64int venus_fsync(struct super_block *sb, struct CodaFid *fid);
65int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);65int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
66 66
67/*
68 * Statistics
69 */
70
71extern struct venus_comm coda_comms[];
72#endif /* __KERNEL__ */
67 73
68/* messages between coda filesystem in kernel and Venus */74/* messages between coda filesystem in kernel and Venus */
69struct upc_req {75struct upc_req {
@@ -82,11 +88,4 @@ struct upc_req { · 12 unmodified lines
82#define REQ_WRITE 0x488#define REQ_WRITE 0x4
83#define REQ_ABORT 0x889#define REQ_ABORT 0x8
84 90
85
86/*
87 * Statistics
88 */
89
90extern struct venus_comm coda_comms[];
91
92#endif91#endif
include/linux/in6.h+1−1
@@ -44,11 +44,11 @@ struct in6_addr · 43 unmodified lines
44 * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined44 * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined
45 * in network byte order, not in host byte order as are the IPv4 equivalents45 * in network byte order, not in host byte order as are the IPv4 equivalents
46 */46 */
47#ifdef __KERNEL__
47extern const struct in6_addr in6addr_any;48extern const struct in6_addr in6addr_any;
48#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }49#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
49extern const struct in6_addr in6addr_loopback;50extern const struct in6_addr in6addr_loopback;
50#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }51#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
51#ifdef __KERNEL__
52extern const struct in6_addr in6addr_linklocal_allnodes;52extern const struct in6_addr in6addr_linklocal_allnodes;
53#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \53#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \
54 { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }54 { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
include/linux/nubus.h+2−0
@@ -237,6 +237,7 @@ struct nubus_dirent · 236 unmodified lines
237 int mask;237 int mask;
238};238};
239 239
240#ifdef __KERNEL__
240struct nubus_board {241struct nubus_board {
241 struct nubus_board* next;242 struct nubus_board* next;
242 struct nubus_dev* first_dev;243 struct nubus_dev* first_dev;
@@ -351,6 +352,7 @@ void nubus_get_rsrc_mem(void* dest, · 108 unmodified lines
351void nubus_get_rsrc_str(void* dest,352void nubus_get_rsrc_str(void* dest,
352 const struct nubus_dirent *dirent,353 const struct nubus_dirent *dirent,
353 int maxlen);354 int maxlen);
355#endif /* __KERNEL__ */
354 356
355/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */357/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */
356static inline void *nubus_slot_addr(int slot)358static inline void *nubus_slot_addr(int slot)
include/linux/reiserfs_fs.h+29−27
@@ -28,8 +28,6 @@ · 27 unmodified lines
28#include <linux/reiserfs_fs_sb.h>28#include <linux/reiserfs_fs_sb.h>
29#endif29#endif
30 30
31struct fid;
32
33/*31/*
34 * include/linux/reiser_fs.h32 * 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)
63struct fid;
64
40/* in reading the #defines, it may help to understand that they employ65/* in reading the #defines, it may help to understand that they employ
41 the following abbreviations: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/* object identifier for root dir */723/* object identifier for root dir */
699#define REISERFS_ROOT_OBJECTID 2724#define REISERFS_ROOT_OBJECTID 2
700#define REISERFS_ROOT_PARENT_OBJECTID 1725#define REISERFS_ROOT_PARENT_OBJECTID 1
726
701extern struct reiserfs_key root_key;727extern struct reiserfs_key root_key;
702 728
703/* 729/*
@@ -1540,7 +1566,6 @@ struct reiserfs_iget_args { · 836 unmodified lines
1540/* FUNCTION DECLARATIONS */1566/* FUNCTION DECLARATIONS */
1541/***************************************************************************/1567/***************************************************************************/
1542 1568
1543/*#ifdef __KERNEL__*/
1544#define get_journal_desc_magic(bh) (bh->b_data + bh->b_size - 12)1569#define get_journal_desc_magic(bh) (bh->b_data + bh->b_size - 12)
1545 1570
1546#define journal_trans_half(blocksize) \1571#define journal_trans_half(blocksize) \
@@ -2178,29 +2203,6 @@ long reiserfs_compat_ioctl(struct file *filp, · 631 unmodified lines
2178 unsigned int cmd, unsigned long arg);2203 unsigned int cmd, unsigned long arg);
2179int reiserfs_unpack(struct inode *inode, struct file *filp);2204int 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#endif /* _LINUX_REISER_FS_H */2208#endif /* _LINUX_REISER_FS_H */
include/linux/socket.h+4−2
@@ -24,10 +24,12 @@ struct __kernel_sockaddr_storage { · 23 unmodified lines
24#include <linux/types.h> /* pid_t */24#include <linux/types.h> /* pid_t */
25#include <linux/compiler.h> /* __user */25#include <linux/compiler.h> /* __user */
26 26
27#ifdef CONFIG_PROC_FS27#ifdef __KERNEL__
28# ifdef CONFIG_PROC_FS
28struct seq_file;29struct seq_file;
29extern void socket_seq_show(struct seq_file *seq);30extern void socket_seq_show(struct seq_file *seq);
30#endif31# endif
32#endif /* __KERNEL__ */
31 33
32typedef unsigned short sa_family_t;34typedef unsigned short sa_family_t;
33 35
include/linux/types.h+4−2
@@ -1,6 +1,9 @@
1#ifndef _LINUX_TYPES_H1#ifndef _LINUX_TYPES_H
2#define _LINUX_TYPES_H2#define _LINUX_TYPES_H
3 3
4#include <asm/types.h>
5
6#ifndef __ASSEMBLY__
4#ifdef __KERNEL__7#ifdef __KERNEL__
5 8
6#define DECLARE_BITMAP(name,bits) \9#define DECLARE_BITMAP(name,bits) \
@@ -9,7 +12,6 @@ · 2 unmodified lines
9#endif12#endif
10 13
11#include <linux/posix_types.h>14#include <linux/posix_types.h>
12#include <asm/types.h>
13 15
14#ifndef __KERNEL_STRICT_NAMES16#ifndef __KERNEL_STRICT_NAMES
15 17
@@ -212,5 +214,5 @@ struct ustat { · 196 unmodified lines
212};214};
213 215
214#endif /* __KERNEL__ */216#endif /* __KERNEL__ */
215 217#endif /* __ASSEMBLY__ */
216#endif /* _LINUX_TYPES_H */218#endif /* _LINUX_TYPES_H */
scripts/headers_check.pl+1−1
@@ -38,7 +38,7 @@ foreach my $file (@files) { · 37 unmodified lines
38 &check_asm_types();38 &check_asm_types();
39 &check_sizetypes();39 &check_sizetypes();
40 &check_prototypes();40 &check_prototypes();
41 &check_config();41 # Dropped for now. Too much noise &check_config();
42 }42 }
43 close FH;43 close FH;
44}44}