Skip to content

Commit fadcfa3

Browse files
dwmw2dwmw2
committed
[HEADERS] One line per header in Kbuild files to reduce conflicts
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
1 parent 47a5c6f commit fadcfa3

File tree

29 files changed

+721
-159
lines changed

29 files changed

+721
-159
lines changed

‎include/Kbuild‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/
2-
header-y += asm-$(ARCH)/
1+
header-y += asm-generic/
2+
header-y += linux/
3+
header-y += scsi/
4+
header-y += sound/
5+
header-y += mtd/
6+
header-y += rdma/
7+
header-y += video/
8+
9+
header-y += asm-$(ARCH)/

‎include/asm-alpha/Kbuild‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
include include/asm-generic/Kbuild.asm
22

3-
unifdef-y += console.h fpu.h sysinfo.h compiler.h
3+
header-y += gentrap.h
4+
header-y += regdef.h
5+
header-y += pal.h
6+
header-y += reg.h
47

5-
header-y += gentrap.h regdef.h pal.h reg.h
8+
unifdef-y += console.h
9+
unifdef-y += fpu.h
10+
unifdef-y += sysinfo.h
11+
unifdef-y += compiler.h

‎include/asm-generic/Kbuild‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
header-y += atomic.h errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h \
2-
signal.h statfs.h
3-
unifdef-y := resource.h siginfo.h
1+
header-y += atomic.h
2+
header-y += errno-base.h
3+
header-y += errno.h
4+
header-y += fcntl.h
5+
header-y += ioctl.h
6+
header-y += ipc.h
7+
header-y += mman.h
8+
header-y += signal.h
9+
header-y += statfs.h
10+
11+
unifdef-y += resource.h
12+
unifdef-y += siginfo.h

‎include/asm-generic/Kbuild.asm‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,34 @@
1-
unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \
2-
ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \
3-
posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \
4-
sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h \
5-
statfs.h termbits.h termios.h types.h unistd.h user.h
1+
unifdef-y += a.out.h
2+
unifdef-y += auxvec.h
3+
unifdef-y += byteorder.h
4+
unifdef-y += errno.h
5+
unifdef-y += fcntl.h
6+
unifdef-y += ioctl.h
7+
unifdef-y += ioctls.h
8+
unifdef-y += ipcbuf.h
9+
unifdef-y += mman.h
10+
unifdef-y += msgbuf.h
11+
unifdef-y += param.h
12+
unifdef-y += poll.h
13+
unifdef-y += posix_types.h
14+
unifdef-y += ptrace.h
15+
unifdef-y += resource.h
16+
unifdef-y += sembuf.h
17+
unifdef-y += shmbuf.h
18+
unifdef-y += sigcontext.h
19+
unifdef-y += siginfo.h
20+
unifdef-y += signal.h
21+
unifdef-y += socket.h
22+
unifdef-y += sockios.h
23+
unifdef-y += stat.h
24+
unifdef-y += statfs.h
25+
unifdef-y += termbits.h
26+
unifdef-y += termios.h
27+
unifdef-y += types.h
28+
unifdef-y += unistd.h
29+
unifdef-y += user.h
630

731
# These probably shouldn't be exported
8-
unifdef-y += elf.h page.h
32+
unifdef-y += shmparam.h
33+
unifdef-y += elf.h
34+
unifdef-y += page.h

‎include/asm-i386/Kbuild‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
include include/asm-generic/Kbuild.asm
22

3-
header-y += boot.h debugreg.h ldt.h ucontext.h
3+
header-y += boot.h
4+
header-y += debugreg.h
5+
header-y += ldt.h
6+
header-y += ucontext.h
47

5-
unifdef-y += mtrr.h setup.h vm86.h
8+
unifdef-y += mtrr.h
9+
unifdef-y += setup.h
10+
unifdef-y += vm86.h

‎include/asm-ia64/Kbuild‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
include include/asm-generic/Kbuild.asm
22

3-
header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h \
4-
intel_intrin.h intrinsics.h perfmon_default_smpl.h \
5-
ptrace_offsets.h rse.h setup.h ucontext.h
3+
header-y += break.h
4+
header-y += fpu.h
5+
header-y += fpswa.h
6+
header-y += gcc_intrin.h
7+
header-y += ia64regs.h
8+
header-y += intel_intrin.h
9+
header-y += intrinsics.h
10+
header-y += perfmon_default_smpl.h
11+
header-y += ptrace_offsets.h
12+
header-y += rse.h
13+
header-y += setup.h
14+
header-y += ucontext.h
615

7-
unifdef-y += perfmon.h ustack.h
16+
unifdef-y += perfmon.h
17+
unifdef-y += ustack.h

‎include/asm-powerpc/Kbuild‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,41 @@
11
include include/asm-generic/Kbuild.asm
22

3-
unifdef-y += a.out.h asm-compat.h bootx.h byteorder.h cputable.h elf.h \
4-
nvram.h param.h posix_types.h ptrace.h seccomp.h signal.h \
5-
termios.h types.h unistd.h
3+
header-y += auxvec.h
4+
header-y += ioctls.h
5+
header-y += mman.h
6+
header-y += sembuf.h
7+
header-y += siginfo.h
8+
header-y += stat.h
9+
header-y += errno.h
10+
header-y += ipcbuf.h
11+
header-y += msgbuf.h
12+
header-y += shmbuf.h
13+
header-y += socket.h
14+
header-y += termbits.h
15+
header-y += fcntl.h
16+
header-y += ipc.h
17+
header-y += poll.h
18+
header-y += shmparam.h
19+
header-y += sockios.h
20+
header-y += ucontext.h
21+
header-y += ioctl.h
22+
header-y += linkage.h
23+
header-y += resource.h
24+
header-y += sigcontext.h
25+
header-y += statfs.h
626

7-
header-y += auxvec.h ioctls.h mman.h sembuf.h siginfo.h stat.h errno.h \
8-
ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h \
9-
poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h \
10-
resource.h sigcontext.h statfs.h
27+
unifdef-y += a.out.h
28+
unifdef-y += asm-compat.h
29+
unifdef-y += bootx.h
30+
unifdef-y += byteorder.h
31+
unifdef-y += cputable.h
32+
unifdef-y += elf.h
33+
unifdef-y += nvram.h
34+
unifdef-y += param.h
35+
unifdef-y += posix_types.h
36+
unifdef-y += ptrace.h
37+
unifdef-y += seccomp.h
38+
unifdef-y += signal.h
39+
unifdef-y += termios.h
40+
unifdef-y += types.h
41+
unifdef-y += unistd.h

‎include/asm-s390/Kbuild‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
include include/asm-generic/Kbuild.asm
22

3-
unifdef-y += cmb.h debug.h
4-
header-y += dasd.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h
3+
header-y += dasd.h
4+
header-y += qeth.h
5+
header-y += tape390.h
6+
header-y += ucontext.h
7+
header-y += vtoc.h
8+
header-y += z90crypt.h
9+
10+
unifdef-y += cmb.h
11+
unifdef-y += debug.h

‎include/asm-sparc/Kbuild‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
include include/asm-generic/Kbuild.asm
22

3-
unifdef-y += fbio.h perfctr.h psr.h
4-
header-y += apc.h asi.h auxio.h bpp.h head.h ipc.h jsflash.h \
5-
openpromio.h pbm.h pconf.h pgtsun4.h reg.h traps.h \
6-
turbosparc.h vfc_ioctls.h winmacro.h
3+
header-y += apc.h
4+
header-y += asi.h
5+
header-y += auxio.h
6+
header-y += bpp.h
7+
header-y += head.h
8+
header-y += ipc.h
9+
header-y += jsflash.h
10+
header-y += openpromio.h
11+
header-y += pbm.h
12+
header-y += pconf.h
13+
header-y += pgtsun4.h
14+
header-y += reg.h
15+
header-y += traps.h
16+
header-y += turbosparc.h
17+
header-y += vfc_ioctls.h
18+
header-y += winmacro.h
19+
20+
unifdef-y += fbio.h
21+
unifdef-y += perfctr.h
22+
unifdef-y += psr.h

‎include/asm-sparc64/Kbuild‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,26 @@ ALTARCH := sparc
44
ARCHDEF := defined __sparc__ && defined __arch64__
55
ALTARCHDEF := defined __sparc__ && !defined __arch64__
66

7-
unifdef-y += fbio.h perfctr.h
8-
header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h \
9-
ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h \
10-
pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h
7+
header-y += apb.h
8+
header-y += asi.h
9+
header-y += bbc.h
10+
header-y += bpp.h
11+
header-y += display7seg.h
12+
header-y += envctrl.h
13+
header-y += floppy.h
14+
header-y += ipc.h
15+
header-y += kdebug.h
16+
header-y += mostek.h
17+
header-y += openprom.h
18+
header-y += openpromio.h
19+
header-y += parport.h
20+
header-y += pconf.h
21+
header-y += psrcompat.h
22+
header-y += pstate.h
23+
header-y += reg.h
24+
header-y += uctx.h
25+
header-y += utrap.h
26+
header-y += watchdog.h
27+
28+
unifdef-y += fbio.h
29+
unifdef-y += perfctr.h

0 commit comments

Comments
 (0)