mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
ed2d265d12
"[RFC - PATCH 0/7] consolidation of BUG support code." https://lkml.org/lkml/2012/1/26/525 -- 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPbNwpAAoJEOvOhAQsB9HWrqYP/A0t9VB0nK6e42F0OR2P14MZ GJFtf1B++wwioIrx+KSWSRfSur1C5FKhDbxLR3I/pvkAYl4+T4JvRdMG6xJwxyip CC1kVQQNDjWVVqzjz2x6rYkOffx6dUlw/ERyIyk+OzP+1HzRIsIrugMqbzGLlX0X y0v2Tbd0G6xg1DV8lcRdp95eIzcGuUvdb2iY2LGadWZczEOeSXx64Jz3QCFxg3aL LFU4oovsg8Nb7MRJmqDvHK/oQf5vaTm9WSrS0pvVte0msSQRn8LStYdWC0G9BPCS GwL86h/eLXlUXQlC5GpgWg1QQt5i2QpjBFcVBIG0IT5SgEPMx+gXyiqZva2KwbHu LKicjKtfnzPitQnyEV/N6JyV1fb1U6/MsB7ebU5nCCzt9Gr7MYbjZ44peNeprAtu HMvJ/BNnRr4Ha6nPQNu952AdASPKkxmeXFUwBL1zUbLkOX/bK/vy1ujlcdkFxCD7 fP3t7hghYa737IHk0ehUOhrE4H67hvxTSCKioLUAy/YeN1IcfH/iOQiCBQVLWmoS AqYV6ou9cqgdYoyila2UeAqegb+8xyubPIHt+lebcaKxs5aGsTg+r3vq5juMDAPs iwSVYUDcIw9dHer1lJfo7QCy3QUTRDTxh+LB9VlHXQICgeCK02sLBOi9hbEr4/H8 Ko9g8J3BMxcMkXLHT9ud =PYQT -----END PGP SIGNATURE----- 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. |
||
---|---|---|
.. | ||
a.out-core.h | ||
a.out.h | ||
adb_iop.h | ||
amigahw.h | ||
amigaints.h | ||
amigayle.h | ||
amipcmcia.h | ||
apollodma.h | ||
apollohw.h | ||
asm-offsets.h | ||
atafd.h | ||
atafdreg.h | ||
atari_joystick.h | ||
atari_stdma.h | ||
atari_stram.h | ||
atarihw.h | ||
atariints.h | ||
atarikb.h | ||
atomic.h | ||
auxvec.h | ||
bitops.h | ||
bitsperlong.h | ||
blinken.h | ||
bootinfo.h | ||
bootstd.h | ||
bug.h | ||
bugs.h | ||
bvme6000hw.h | ||
byteorder.h | ||
cache.h | ||
cachectl.h | ||
cacheflush.h | ||
cacheflush_mm.h | ||
cacheflush_no.h | ||
checksum.h | ||
coldfire.h | ||
commproc.h | ||
contregs.h | ||
cputime.h | ||
current.h | ||
dbg.h | ||
delay.h | ||
device.h | ||
div64.h | ||
dma-mapping.h | ||
dma.h | ||
dsp56k.h | ||
dvma.h | ||
elf.h | ||
emergency-restart.h | ||
entry.h | ||
errno.h | ||
fb.h | ||
fbio.h | ||
fcntl.h | ||
flat.h | ||
floppy.h | ||
fpu.h | ||
ftrace.h | ||
futex.h | ||
gpio.h | ||
hardirq.h | ||
hp300hw.h | ||
hw_irq.h | ||
hwtest.h | ||
ide.h | ||
idprom.h | ||
intersil.h | ||
io.h | ||
io_mm.h | ||
io_no.h | ||
ioctl.h | ||
ioctls.h | ||
ipcbuf.h | ||
irq.h | ||
irq_regs.h | ||
irqflags.h | ||
Kbuild | ||
kdebug.h | ||
kmap_types.h | ||
linkage.h | ||
local.h | ||
local64.h | ||
m52xxacr.h | ||
m53xxacr.h | ||
m54xxacr.h | ||
m54xxgpt.h | ||
m54xxsim.h | ||
m520xsim.h | ||
m523xsim.h | ||
m527xsim.h | ||
m528xsim.h | ||
m532xsim.h | ||
m5206sim.h | ||
m5249sim.h | ||
m5272sim.h | ||
m5307sim.h | ||
m5407sim.h | ||
m68360.h | ||
m68360_enet.h | ||
m68360_pram.h | ||
m68360_quicc.h | ||
m68360_regs.h | ||
mac_asc.h | ||
mac_baboon.h | ||
mac_iop.h | ||
mac_mouse.h | ||
mac_oss.h | ||
mac_psc.h | ||
mac_via.h | ||
machdep.h | ||
machines.h | ||
machw.h | ||
macintosh.h | ||
macints.h | ||
math-emu.h | ||
MC68EZ328.h | ||
MC68VZ328.h | ||
MC68328.h | ||
MC68332.h | ||
mc146818rtc.h | ||
mcf_pgalloc.h | ||
mcf_pgtable.h | ||
mcfdma.h | ||
mcfgpio.h | ||
mcfintc.h | ||
mcfmbus.h | ||
mcfmmu.h | ||
mcfne.h | ||
mcfpit.h | ||
mcfqspi.h | ||
mcfsim.h | ||
mcfslt.h | ||
mcftimer.h | ||
mcfuart.h | ||
mcfwdebug.h | ||
mman.h | ||
mmu.h | ||
mmu_context.h | ||
mmzone.h | ||
module.h | ||
motorola_pgalloc.h | ||
motorola_pgtable.h | ||
movs.h | ||
msgbuf.h | ||
mutex.h | ||
mvme16xhw.h | ||
mvme147hw.h | ||
natfeat.h | ||
nettel.h | ||
nubus.h | ||
openprom.h | ||
oplib.h | ||
page.h | ||
page_mm.h | ||
page_no.h | ||
page_offset.h | ||
param.h | ||
parport.h | ||
pci.h | ||
percpu.h | ||
pgalloc.h | ||
pgtable.h | ||
pgtable_mm.h | ||
pgtable_no.h | ||
pinmux.h | ||
poll.h | ||
posix_types.h | ||
processor.h | ||
ptrace.h | ||
q40_master.h | ||
q40ints.h | ||
quicc_simple.h | ||
raw_io.h | ||
resource.h | ||
rtc.h | ||
sbus.h | ||
scatterlist.h | ||
sections.h | ||
segment.h | ||
sembuf.h | ||
serial.h | ||
setup.h | ||
shm.h | ||
shmbuf.h | ||
shmparam.h | ||
sigcontext.h | ||
siginfo.h | ||
signal.h | ||
smp.h | ||
socket.h | ||
sockios.h | ||
spinlock.h | ||
stat.h | ||
statfs.h | ||
string.h | ||
sun3-head.h | ||
sun3_pgalloc.h | ||
sun3_pgtable.h | ||
sun3ints.h | ||
sun3mmu.h | ||
sun3x.h | ||
sun3xflop.h | ||
sun3xprom.h | ||
swab.h | ||
system.h | ||
termbits.h | ||
termios.h | ||
thread_info.h | ||
timex.h | ||
tlb.h | ||
tlbflush.h | ||
topology.h | ||
traps.h | ||
types.h | ||
uaccess.h | ||
uaccess_mm.h | ||
uaccess_no.h | ||
ucontext.h | ||
unaligned.h | ||
unistd.h | ||
user.h | ||
virtconvert.h | ||
xor.h | ||
zorro.h |