diff options
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-generic/bitsperlong.h | 4 | ||||
-rw-r--r-- | include/asm-generic/bug.h | 7 | ||||
-rw-r--r-- | include/asm-generic/pgtable.h | 10 | ||||
-rw-r--r-- | include/asm-generic/posix_types.h | 4 |
5 files changed, 20 insertions, 6 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 53f91b1ae53a..2c85a0f647b7 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild | |||
@@ -8,6 +8,7 @@ header-y += int-ll64.h | |||
8 | header-y += ioctl.h | 8 | header-y += ioctl.h |
9 | header-y += ioctls.h | 9 | header-y += ioctls.h |
10 | header-y += ipcbuf.h | 10 | header-y += ipcbuf.h |
11 | header-y += kvm_para.h | ||
11 | header-y += mman-common.h | 12 | header-y += mman-common.h |
12 | header-y += mman.h | 13 | header-y += mman.h |
13 | header-y += msgbuf.h | 14 | header-y += msgbuf.h |
diff --git a/include/asm-generic/bitsperlong.h b/include/asm-generic/bitsperlong.h index 4ae54e07de83..a7b0914348fd 100644 --- a/include/asm-generic/bitsperlong.h +++ b/include/asm-generic/bitsperlong.h | |||
@@ -28,5 +28,9 @@ | |||
28 | #error Inconsistent word size. Check asm/bitsperlong.h | 28 | #error Inconsistent word size. Check asm/bitsperlong.h |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | #ifndef BITS_PER_LONG_LONG | ||
32 | #define BITS_PER_LONG_LONG 64 | ||
33 | #endif | ||
34 | |||
31 | #endif /* __KERNEL__ */ | 35 | #endif /* __KERNEL__ */ |
32 | #endif /* __ASM_GENERIC_BITS_PER_LONG */ | 36 | #endif /* __ASM_GENERIC_BITS_PER_LONG */ |
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 2520a6e241dc..506ec19a3736 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
@@ -31,6 +31,9 @@ struct bug_entry { | |||
31 | 31 | ||
32 | #endif /* CONFIG_GENERIC_BUG */ | 32 | #endif /* CONFIG_GENERIC_BUG */ |
33 | 33 | ||
34 | #ifndef __ASSEMBLY__ | ||
35 | #include <linux/kernel.h> | ||
36 | |||
34 | /* | 37 | /* |
35 | * Don't use BUG() or BUG_ON() unless there's really no way out; one | 38 | * Don't use BUG() or BUG_ON() unless there's really no way out; one |
36 | * example might be detecting data structure corruption in the middle | 39 | * example might be detecting data structure corruption in the middle |
@@ -60,7 +63,6 @@ struct bug_entry { | |||
60 | * to provide better diagnostics. | 63 | * to provide better diagnostics. |
61 | */ | 64 | */ |
62 | #ifndef __WARN_TAINT | 65 | #ifndef __WARN_TAINT |
63 | #ifndef __ASSEMBLY__ | ||
64 | extern __printf(3, 4) | 66 | extern __printf(3, 4) |
65 | void warn_slowpath_fmt(const char *file, const int line, | 67 | void warn_slowpath_fmt(const char *file, const int line, |
66 | const char *fmt, ...); | 68 | const char *fmt, ...); |
@@ -69,7 +71,6 @@ void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint, | |||
69 | const char *fmt, ...); | 71 | const char *fmt, ...); |
70 | extern void warn_slowpath_null(const char *file, const int line); | 72 | extern void warn_slowpath_null(const char *file, const int line); |
71 | #define WANT_WARN_ON_SLOWPATH | 73 | #define WANT_WARN_ON_SLOWPATH |
72 | #endif | ||
73 | #define __WARN() warn_slowpath_null(__FILE__, __LINE__) | 74 | #define __WARN() warn_slowpath_null(__FILE__, __LINE__) |
74 | #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg) | 75 | #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg) |
75 | #define __WARN_printf_taint(taint, arg...) \ | 76 | #define __WARN_printf_taint(taint, arg...) \ |
@@ -202,4 +203,6 @@ extern void warn_slowpath_null(const char *file, const int line); | |||
202 | # define WARN_ON_SMP(x) ({0;}) | 203 | # define WARN_ON_SMP(x) ({0;}) |
203 | #endif | 204 | #endif |
204 | 205 | ||
206 | #endif /* __ASSEMBLY__ */ | ||
207 | |||
205 | #endif | 208 | #endif |
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 6f2b45a9b6bc..ff4947b7a976 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
@@ -484,6 +484,16 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd) | |||
484 | /* | 484 | /* |
485 | * The barrier will stabilize the pmdval in a register or on | 485 | * The barrier will stabilize the pmdval in a register or on |
486 | * the stack so that it will stop changing under the code. | 486 | * the stack so that it will stop changing under the code. |
487 | * | ||
488 | * When CONFIG_TRANSPARENT_HUGEPAGE=y on x86 32bit PAE, | ||
489 | * pmd_read_atomic is allowed to return a not atomic pmdval | ||
490 | * (for example pointing to an hugepage that has never been | ||
491 | * mapped in the pmd). The below checks will only care about | ||
492 | * the low part of the pmd with 32bit PAE x86 anyway, with the | ||
493 | * exception of pmd_none(). So the important thing is that if | ||
494 | * the low part of the pmd is found null, the high part will | ||
495 | * be also null or the pmd_none() check below would be | ||
496 | * confused. | ||
487 | */ | 497 | */ |
488 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 498 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
489 | barrier(); | 499 | barrier(); |
diff --git a/include/asm-generic/posix_types.h b/include/asm-generic/posix_types.h index 91d44bd4dde3..fe74fccf18db 100644 --- a/include/asm-generic/posix_types.h +++ b/include/asm-generic/posix_types.h | |||
@@ -23,10 +23,6 @@ typedef __kernel_ulong_t __kernel_ino_t; | |||
23 | typedef unsigned int __kernel_mode_t; | 23 | typedef unsigned int __kernel_mode_t; |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #ifndef __kernel_nlink_t | ||
27 | typedef __kernel_ulong_t __kernel_nlink_t; | ||
28 | #endif | ||
29 | |||
30 | #ifndef __kernel_pid_t | 26 | #ifndef __kernel_pid_t |
31 | typedef int __kernel_pid_t; | 27 | typedef int __kernel_pid_t; |
32 | #endif | 28 | #endif |