diff options
| author | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
| commit | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch) | |
| tree | a1f22225aace571661c29e59ebd024bc4619e054 /include/linux/kernel.h | |
| parent | 1fe797e67fb07d605b82300934d0de67068a0aca (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 792bf0aa779b..2e70006c7fa8 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -46,6 +46,9 @@ extern const char linux_proc_banner[]; #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) +#define _RET_IP_ (unsigned long)__builtin_return_address(0) +#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) + #ifdef CONFIG_LBD # include <asm/div64.h> # define sector_div(a, b) do_div(a, b) |