diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:12:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:12:55 +0100 |
| commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
| tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /include/linux/magic.h | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff) | |
| download | blackbird-op-linux-6a385db5ce7f1fd2c68ec511e44587b67dab8fca.tar.gz blackbird-op-linux-6a385db5ce7f1fd2c68ec511e44587b67dab8fca.zip | |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index 0b4df7eba852..5b4e28bcb788 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -49,4 +49,5 @@ #define FUTEXFS_SUPER_MAGIC 0xBAD1DEA #define INOTIFYFS_SUPER_MAGIC 0x2BAD1DEA +#define STACK_END_MAGIC 0x57AC6E9D #endif /* __LINUX_MAGIC_H__ */ |
