tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull treewide kbuild cleanup from Michal Marek:
"Paul Bolle did a cleanup of <asm/*.h> headers in various
architectures. Because the patch touch several architectures at
once, it was easiest for me to apply them to the kbuild tree."

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
Remove useless wrappers of asm-generic/rmap.h
Remove useless wrappers of asm-generic/ipc.h
Remove useless wrappers of asm-generic/cpumask.h

Linus Torvalds 637e49ae f6774cbc

-44
-6
arch/frv/include/asm/cpumask.h
··· 1 - #ifndef _ASM_CPUMASK_H 2 - #define _ASM_CPUMASK_H 3 - 4 - #include <asm-generic/cpumask.h> 5 - 6 - #endif /* _ASM_CPUMASK_H */
-2
arch/hexagon/include/asm/Kbuild
··· 7 7 generic-y += auxvec.h 8 8 generic-y += bug.h 9 9 generic-y += bugs.h 10 - generic-y += cpumask.h 11 10 generic-y += cputime.h 12 11 generic-y += current.h 13 12 generic-y += device.h ··· 22 23 generic-y += ioctls.h 23 24 generic-y += iomap.h 24 25 generic-y += ipcbuf.h 25 - generic-y += ipc.h 26 26 generic-y += irq_regs.h 27 27 generic-y += kdebug.h 28 28 generic-y += kmap_types.h
-1
arch/mn10300/include/asm/ipc.h
··· 1 - #include <asm-generic/ipc.h>
-2
arch/openrisc/include/asm/Kbuild
··· 13 13 generic-y += checksum.h 14 14 generic-y += cmpxchg.h 15 15 generic-y += cmpxchg-local.h 16 - generic-y += cpumask.h 17 16 generic-y += cputime.h 18 17 generic-y += current.h 19 18 generic-y += device.h ··· 42 43 generic-y += poll.h 43 44 generic-y += posix_types.h 44 45 generic-y += resource.h 45 - generic-y += rmap.h 46 46 generic-y += scatterlist.h 47 47 generic-y += sections.h 48 48 generic-y += segment.h
-1
arch/tile/include/asm/Kbuild
··· 16 16 generic-y += fcntl.h 17 17 generic-y += ioctl.h 18 18 generic-y += ioctls.h 19 - generic-y += ipc.h 20 19 generic-y += ipcbuf.h 21 20 generic-y += irq_regs.h 22 21 generic-y += kdebug.h
-16
arch/xtensa/include/asm/cpumask.h
··· 1 - /* 2 - * include/asm-xtensa/cpumask.h 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 - * 8 - * Copyright (C) 2001 - 2005 Tensilica Inc. 9 - */ 10 - 11 - #ifndef _XTENSA_CPUMASK_H 12 - #define _XTENSA_CPUMASK_H 13 - 14 - #include <asm-generic/cpumask.h> 15 - 16 - #endif /* _XTENSA_CPUMASK_H */
-16
arch/xtensa/include/asm/rmap.h
··· 1 - /* 2 - * include/asm-xtensa/rmap.h 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 - * 8 - * Copyright (C) 2001 - 2005 Tensilica Inc. 9 - */ 10 - 11 - #ifndef _XTENSA_RMAP_H 12 - #define _XTENSA_RMAP_H 13 - 14 - #include <asm-generic/rmap.h> 15 - 16 - #endif