diff --git a/[refs] b/[refs] index cd75cb8c1330..110726a1e8bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 893de2dffb0923d9bdba4abd66afcec3cf9103ba +refs/heads/master: 5be02f1d8af4c7baf3a5a31ab9c0cba9fdc52680 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index e91dce75bbcc..3531764318f2 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -92,11 +92,6 @@ extern int cond_resched(void); (__x < 0) ? -__x : __x; \ }) -#define labs(x) ({ \ - long __x = (x); \ - (__x < 0) ? -__x : __x; \ - }) - extern struct atomic_notifier_head panic_notifier_list; extern long (*panic_blink)(long time); NORET_TYPE void panic(const char * fmt, ...)