Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed2d265d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents f1d38e42 6c03438e

arch/arm/mach-imx/cpu_op-mx51.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include <linux/bug.h>

#include <linux/types.h>

#include <mach/hardware.h>

#include <linux/kernel.h>

arch/arm/mach-ux500/board-mop500-pins.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/bug.h>



#include <asm/mach-types.h>

#include <plat/pincfg.h>

arch/avr32/include/asm/io.h

+1 −0
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_IO_H

#define __ASM_AVR32_IO_H



#include <linux/bug.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/types.h>

arch/m68k/include/asm/system.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/linkage.h>

#include <linux/kernel.h>

#include <linux/bug.h>

#include <linux/irqflags.h>

#include <asm/segment.h>

#include <asm/entry.h>

arch/mips/fw/arc/cmdline.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *

 * Copyright (C) 1996 David S. Miller (davem@davemloft.net)

 */

#include <linux/bug.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/string.h>