diff options
| author | Alex Shi <alex.shi@linaro.org> | 2013-12-22 11:12:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2013-12-22 11:12:04 +0800 |
| commit | 3c6556b1a9c2f9c91aacbc57bac938691fedda81 (patch) | |
| tree | ec95f19f5ed70514a148720429c7926a52a366c5 /include/linux | |
| parent | b8420132aa326738c0139b85a65f9fc12764570d (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler-intel.h | 2 | ||||
| -rw-r--r-- | include/linux/kexec.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index 973ce10c40b..dc1bd3dcf11 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -28,8 +28,6 @@ #endif -#define uninitialized_var(x) x - #ifndef __HAVE_BUILTIN_BSWAP16__ /* icc has this, but it's called _bswap16 */ #define __HAVE_BUILTIN_BSWAP16__ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d78d28a733b..5fd33dc1fe3 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -198,6 +198,9 @@ extern u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4]; extern size_t vmcoreinfo_size; extern size_t vmcoreinfo_max_size; +/* flag to track if kexec reboot is in progress */ +extern bool kexec_in_progress; + int __init parse_crashkernel(char *cmdline, unsigned long long system_ram, unsigned long long *crash_size, unsigned long long *crash_base); int parse_crashkernel_high(char *cmdline, unsigned long long system_ram, |