Linus Torvalds ed2d265d12
Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ...
Pull <linux/bug.h> cleanup from Paul Gortmaker:
"The changes shown here are to unify linux's BUG support under the one
<linux/bug.h> file. Due to historical reasons, we have some BUG code
in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in
linux/kernel.h predates the addition of linux/bug.h, but old code in
kernel.h wasn't moved to bug.h at that time. As a band-aid, kernel.h
was including <asm/bug.h> to pseudo link them.
This has caused confusion[1] and general yuck/WTF[2] reactions. Here
is an example that violates the principle of least surprise:
CC lib/string.o
lib/string.c: In function 'strlcat':
lib/string.c:225:2: error: implicit declaration of function 'BUILD_BUG_ON'
make[2]: *** [lib/string.o] Error 1
$
$ grep linux/bug.h lib/string.c
#include <linux/bug.h>
$
We've included <linux/bug.h> for the BUG infrastructure and yet we
still get a compile fail! [We've not kernel.h for BUILD_BUG_ON.] Ugh -
very confusing for someone who is new to kernel development.
With the above in mind, the goals of this changeset are:
1) find and fix any include/*.h files that were relying on the
implicit presence of BUG code.
2) find and fix any C files that were consuming kernel.h and hence
relying on implicitly getting some/all BUG code.
3) Move the BUG related code living in kernel.h to <linux/bug.h>
4) remove the asm/bug.h from kernel.h to finally break the chain.
During development, the order was more like 3-4, build-test, 1-2. But
to ensure that git history for bisect doesn't get needless build
failures introduced, the commits have been reorderd to fix the problem
areas in advance.
[1] https://lkml.org/lkml/2012/1/3/90
[2] https://lkml.org/lkml/2012/1/17/414 "
Fix up conflicts (new radeon file, reiserfs header cleanups) as per Paul
and linux-next.
* tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
kernel.h: doesn't explicitly use bug.h, so don't include it.
bug: consolidate BUILD_BUG_ON with other bug code
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
bug.h: add include of it to various implicit C users
lib: fix implicit users of kernel.h for TAINT_WARN
spinlock: macroize assert_spin_locked to avoid bug.h dependency
x86: relocate get/set debugreg fcns to include/asm/debugreg.
2012-03-24 10:08:39 -07:00
2012-03-23 17:36:29 -07:00
2012-03-06 15:16:18 -05:00
2012-02-03 01:21:25 +01:00
2012-03-04 17:54:34 -05:00
2012-03-23 14:12:04 -07:00
2012-03-17 12:20:44 -07:00
2012-02-15 00:19:48 -05:00
2012-03-22 20:20:18 -07:00
2012-03-21 10:33:42 -07:00
2012-03-23 16:58:31 -07:00
2012-03-04 17:54:34 -05:00
2012-03-07 17:41:28 +01:00
2012-02-21 13:29:06 +01:00
2012-03-07 17:40:56 +01:00
2012-03-07 17:40:49 +01:00
2012-03-12 22:49:02 +01:00
2012-03-22 20:20:18 -07:00
2012-03-13 11:21:23 +11:00
2012-03-18 21:39:19 +00:00
2012-03-15 03:41:01 -06:00
2012-03-24 10:08:39 -07:00
2012-03-21 09:31:31 -04:00
2012-03-15 12:42:07 -07:00
2012-01-17 04:35:20 -05:00
2012-01-18 15:51:48 -08:00
2012-02-09 09:04:23 -08:00
2012-03-01 16:14:48 +01:00
2012-03-04 17:54:34 -05:00
2012-03-07 17:06:08 +11:00
2012-03-20 21:29:40 -04:00
2012-03-20 21:29:46 -04:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:34 -07:00
2012-02-07 07:51:30 +01:00
2012-03-04 17:54:35 -05:00
2012-01-14 18:36:33 -08:00
2012-02-08 20:03:14 +01:00
2012-03-21 17:55:01 -07:00
2012-01-23 16:06:37 -05:00
2012-02-01 18:37:39 -08:00
2012-03-21 17:54:56 -07:00
2012-02-26 09:44:55 -08:00
2012-03-23 16:58:36 -07:00
2012-02-28 16:02:54 +01:00
2012-02-02 15:30:47 -08:00
2012-01-13 09:32:20 +10:30
2012-01-26 16:49:08 -08:00
2012-03-14 14:45:03 -04:00
2012-01-18 15:51:48 -08:00
2012-03-04 17:54:34 -05:00
2012-03-21 17:54:59 -07:00
2012-01-12 20:13:11 -08:00
2012-03-23 16:58:38 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:37 -04:00
2012-03-03 09:02:52 -07:00
2012-03-04 17:54:34 -05:00
2012-03-20 21:29:53 -04:00
2012-03-17 21:51:34 +01:00
2012-03-21 18:55:10 -07:00
2012-02-20 19:46:36 +11:00
2012-03-04 17:54:34 -05:00
2012-01-24 12:48:54 -08:00
2012-02-23 18:54:51 -08:00
2012-02-08 09:19:42 +01:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:53:13 -08:00
2012-02-13 00:46:41 -05:00
2012-03-01 16:41:26 -05:00
2012-01-12 20:13:04 -08:00
2012-03-04 17:54:34 -05:00
2012-03-15 13:35:22 +00:00
2012-03-20 21:29:32 -04:00
2012-03-18 22:15:39 +01:00
2012-03-18 22:15:39 +01:00
2012-01-29 20:35:52 +01:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-02-21 11:08:29 -05:00
2012-02-21 11:08:30 -05:00
2012-03-02 10:38:33 +01:00
2012-02-28 17:10:21 +00:00
2012-02-01 09:13:11 -08:00
2012-03-04 17:54:34 -05:00
2012-03-24 10:08:39 -07:00
2012-03-21 17:55:02 -07:00
2012-03-21 17:54:59 -07:00
2012-03-16 13:36:04 -07:00
2012-02-29 20:47:42 +01:00
2012-03-04 17:54:34 -05:00
2012-02-21 16:56:45 -05:00
2012-03-04 20:41:38 -05:00
2012-01-24 15:51:00 -05:00
2012-03-24 10:08:39 -07:00
2012-02-24 01:37:35 -08:00
2012-02-08 15:52:45 -05:00
2012-02-08 15:52:45 -05:00
2012-01-11 12:56:06 -08:00
2012-03-16 23:00:20 -07:00
2012-03-21 17:54:59 -07:00
2012-01-13 09:32:18 +10:30
2012-03-09 10:56:35 -08:00
2012-02-03 09:48:19 -05:00
2012-03-04 17:54:34 -05:00
2012-02-15 09:45:53 +01:00
2012-02-14 08:44:55 -08:00
2012-02-13 00:46:41 -05:00
2012-02-26 16:48:06 -07:00
2012-03-04 20:41:38 -05:00
2012-02-14 13:45:56 -02:00
2012-02-28 20:01:08 +01:00
2012-03-08 10:50:35 -08:00
2012-03-04 20:41:38 -05:00
2012-03-21 17:54:57 -07:00
2012-03-24 10:08:39 -07:00
2012-01-23 08:38:48 -08:00
2012-03-23 08:53:47 -07:00
2012-03-08 10:50:35 -08:00
2012-03-23 16:58:41 -07:00
2012-03-05 15:49:42 -08:00
2012-03-04 17:54:34 -05:00
2012-01-17 15:40:51 -08:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:35 -07:00
2012-03-23 16:58:34 -07:00
2012-02-29 15:35:41 -06:00
2012-01-12 20:13:03 -08:00
2012-03-23 16:58:33 -07:00
2012-02-02 15:43:40 -08:00
2012-03-23 16:58:31 -07:00
2012-03-15 21:41:34 +01:00
2012-03-03 15:04:45 -05:00
2012-03-21 17:55:02 -07:00
2012-03-04 17:54:34 -05:00
2012-01-23 08:38:47 -08:00
2012-03-21 17:54:57 -07:00
2012-01-13 10:12:23 -08:00
2012-01-12 20:13:10 -08:00
2012-01-12 20:13:03 -08:00
2012-03-24 10:08:39 -07:00
2012-03-21 17:54:56 -07:00
2012-02-02 11:24:44 -08:00
2012-01-13 09:32:14 +10:30
2012-01-13 09:32:28 +10:30
2012-02-02 00:23:14 +11:00
2012-02-21 15:03:48 -05:00
2012-02-24 01:42:07 -08:00
2012-03-24 10:08:39 -07:00
2012-02-24 10:05:59 +01:00
2012-02-26 14:10:44 -05:00
2012-03-06 15:16:19 -05:00
2012-03-06 10:32:47 -05:00
2012-01-31 18:20:28 -05:00
2012-03-02 17:18:10 -05:00
2012-03-21 09:31:44 -04:00
2012-03-05 15:26:47 -05:00
2012-02-16 14:55:27 -05:00
2012-03-17 11:09:33 -04:00
2012-03-21 09:31:46 -04:00
2012-01-31 18:20:25 -05:00
2012-03-04 17:54:34 -05:00
2012-03-12 14:19:34 -04:00
2012-03-23 16:58:31 -07:00
2012-02-16 06:11:23 -07:00
2012-02-01 14:26:30 -07:00
2012-02-26 16:48:06 -07:00
2012-03-05 08:09:09 -07:00
2012-03-21 18:55:10 -07:00
2012-02-23 09:39:23 +02:00
2012-03-21 17:54:58 -07:00
2012-03-14 17:25:56 +08:00
2012-03-21 17:55:01 -07:00
2012-03-24 10:08:39 -07:00
2012-01-12 20:13:10 -08:00
2012-03-04 20:54:01 -05:00
2012-02-23 12:05:21 -08:00
2012-03-23 14:02:12 -07:00
2012-03-04 09:34:15 -08:00
2012-03-09 08:26:05 +01:00
2012-01-12 15:23:04 -08:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:31 -07:00
2012-02-07 12:54:56 -05:00
2012-03-16 21:44:59 +01:00
2012-03-13 22:37:14 +01:00
2012-03-04 23:08:46 +01:00
2012-03-16 21:49:24 +01:00
2012-03-23 16:58:38 -07:00
2012-03-04 17:54:34 -05:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-23 16:58:32 -07:00
2012-03-01 10:28:04 +01:00
2012-03-20 11:16:20 -07:00
2012-02-01 16:53:46 +08:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:38 -04:00
2012-01-12 13:09:09 +01:00
2012-03-04 17:54:34 -05:00
2012-03-24 10:08:39 -07:00
2012-02-21 09:03:41 -08:00
2012-02-21 09:06:08 -08:00
2012-03-14 13:15:48 +00:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:43 -04:00
2012-03-20 21:29:42 -04:00
2012-03-04 17:54:34 -05:00
2012-01-22 15:08:46 -05:00
2012-03-21 17:54:57 -07:00
2012-02-21 16:56:45 -05:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:32 -07:00
2012-03-21 13:25:04 -07:00
2012-03-24 10:08:39 -07:00
2012-03-09 12:47:56 -08:00
2012-03-08 11:38:50 -08:00
2012-02-01 22:23:53 +05:30
2012-02-16 17:08:09 -05:00
2012-01-23 08:38:48 -08:00
2012-02-24 11:42:50 -08:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-03-19 16:53:08 -04:00
2012-03-11 19:11:22 -07:00
2012-02-28 17:49:26 -05:00
2012-02-21 09:06:09 -08:00
2012-02-24 10:05:59 +01:00
2012-02-10 10:44:35 -08:00
2012-02-17 23:36:23 +01:00
2012-03-21 17:54:58 -07:00
2012-03-04 17:54:34 -05:00
2012-02-10 11:42:25 -08:00
2012-03-04 17:54:34 -05:00
2012-01-24 16:40:30 -08:00
2012-03-01 17:57:40 -05:00
2012-01-23 03:15:25 -05:00
2012-01-26 19:44:23 -08:00
2012-03-20 21:29:40 -04:00
2012-03-23 16:58:40 -07:00
2012-02-24 10:05:59 +01:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:38:51 -08:00
2012-02-02 14:55:45 -08:00
2012-03-13 14:24:07 -07:00
2012-03-19 15:33:24 -03:00
2012-03-04 17:54:34 -05:00
2012-02-19 09:50:20 -06:00
2012-01-12 15:44:42 +10:30
2012-02-19 09:50:20 -06:00
2012-01-12 15:44:44 +10:30
2012-03-08 10:50:35 -08:00
2012-03-01 10:28:04 +01:00
2012-03-02 10:51:00 +01:00
2012-03-07 16:08:46 +01:00
ed2d265d12