* [PATCH 1/4] uapi: Allow automatic generation of uapi/asm/ header files
2012-10-11 16:18 [PATCH 0/4] uapi: Allow automatic generation of trivial headers Catalin Marinas
@ 2012-10-11 16:18 ` Catalin Marinas
2012-10-11 16:18 ` Catalin Marinas
2012-10-11 16:18 ` [PATCH 2/4] arm64: Automatically generate UAPI stat.h and unistd.h headers Catalin Marinas
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:18 UTC (permalink / raw)
To: linux-arch, linux-kernel; +Cc: David Howells, Michal Marek, Arnd Bergmann
Several arch/*/include/uapi/asm/* header simply include the
corresponding <asm-generic/*> file. This patch allows such files to be
specified in uapi/asm/Kbuild via "generic-y += ..." to be automatically
generated (similar to asm/Kbuild).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: David Howells <dhowells@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
---
Makefile | 4 +++-
scripts/Makefile.asm-generic | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 86eb6ac..5d0da36 100644
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,9 @@ endif
PHONY += asm-generic
asm-generic:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
- obj=arch/$(SRCARCH)/include/generated/asm
+ src=asm obj=arch/$(SRCARCH)/include/generated/asm
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
+ src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
# To make sure we do not include .config for any of the *config targets
# catch them early, and hand them over to scripts/kconfig/Makefile
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index 40caf3c..d17e0ea 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -5,7 +5,7 @@
# and for each file listed in this file with generic-y creates
# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
-kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild
-include $(kbuild-file)
include scripts/Kbuild.include
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/4] uapi: Allow automatic generation of uapi/asm/ header files
2012-10-11 16:18 ` [PATCH 1/4] uapi: Allow automatic generation of uapi/asm/ header files Catalin Marinas
@ 2012-10-11 16:18 ` Catalin Marinas
0 siblings, 0 replies; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:18 UTC (permalink / raw)
To: linux-arch, linux-kernel; +Cc: David Howells, Michal Marek, Arnd Bergmann
Several arch/*/include/uapi/asm/* header simply include the
corresponding <asm-generic/*> file. This patch allows such files to be
specified in uapi/asm/Kbuild via "generic-y += ..." to be automatically
generated (similar to asm/Kbuild).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: David Howells <dhowells@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
---
Makefile | 4 +++-
scripts/Makefile.asm-generic | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 86eb6ac..5d0da36 100644
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,9 @@ endif
PHONY += asm-generic
asm-generic:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
- obj=arch/$(SRCARCH)/include/generated/asm
+ src=asm obj=arch/$(SRCARCH)/include/generated/asm
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
+ src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
# To make sure we do not include .config for any of the *config targets
# catch them early, and hand them over to scripts/kconfig/Makefile
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index 40caf3c..d17e0ea 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -5,7 +5,7 @@
# and for each file listed in this file with generic-y creates
# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
-kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild
-include $(kbuild-file)
include scripts/Kbuild.include
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] arm64: Automatically generate UAPI stat.h and unistd.h headers
2012-10-11 16:18 [PATCH 0/4] uapi: Allow automatic generation of trivial headers Catalin Marinas
2012-10-11 16:18 ` [PATCH 1/4] uapi: Allow automatic generation of uapi/asm/ header files Catalin Marinas
@ 2012-10-11 16:18 ` Catalin Marinas
2012-10-11 16:18 ` [PATCH 3/4] s390: Automatically generate trivial UAPI headers Catalin Marinas
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:18 UTC (permalink / raw)
To: linux-arch, linux-kernel; +Cc: David Howells
This headers simply include the corresponding asm-generic files, they
can be automatically generated.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/uapi/asm/Kbuild | 5 +++--
arch/arm64/include/uapi/asm/stat.h | 16 ----------------
arch/arm64/include/uapi/asm/unistd.h | 16 ----------------
3 files changed, 3 insertions(+), 34 deletions(-)
delete mode 100644 arch/arm64/include/uapi/asm/stat.h
delete mode 100644 arch/arm64/include/uapi/asm/unistd.h
diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild
index ca5b65f..d459ddf 100644
--- a/arch/arm64/include/uapi/asm/Kbuild
+++ b/arch/arm64/include/uapi/asm/Kbuild
@@ -12,6 +12,7 @@ header-y += setup.h
header-y += sigcontext.h
header-y += siginfo.h
header-y += signal.h
-header-y += stat.h
header-y += statfs.h
-header-y += unistd.h
+
+generic-y += stat.h
+generic-y += unistd.h
diff --git a/arch/arm64/include/uapi/asm/stat.h b/arch/arm64/include/uapi/asm/stat.h
deleted file mode 100644
index eeb702e..0000000
--- a/arch/arm64/include/uapi/asm/stat.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2012 ARM Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <asm-generic/stat.h>
diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h
deleted file mode 100644
index 1caadc2..0000000
--- a/arch/arm64/include/uapi/asm/unistd.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2012 ARM Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <asm-generic/unistd.h>
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/4] s390: Automatically generate trivial UAPI headers
2012-10-11 16:18 [PATCH 0/4] uapi: Allow automatic generation of trivial headers Catalin Marinas
2012-10-11 16:18 ` [PATCH 1/4] uapi: Allow automatic generation of uapi/asm/ header files Catalin Marinas
2012-10-11 16:18 ` [PATCH 2/4] arm64: Automatically generate UAPI stat.h and unistd.h headers Catalin Marinas
@ 2012-10-11 16:18 ` Catalin Marinas
2012-10-11 16:18 ` Catalin Marinas
2012-10-11 16:18 ` [PATCH 4/4] sparc: " Catalin Marinas
2012-10-11 16:46 ` [PATCH 0/4] uapi: Allow automatic generation of trivial headers David Howells
4 siblings, 1 reply; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:18 UTC (permalink / raw)
To: linux-arch, linux-kernel
Cc: David Howells, Martin Schwidefsky, Heiko Carstens
This patch removes several trivial UAPI headers that were simply including
the asm-generic files as they can be automatically generated.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/s390/include/uapi/asm/Kbuild | 19 ++++++++++---------
arch/s390/include/uapi/asm/errno.h | 11 -----------
arch/s390/include/uapi/asm/fcntl.h | 1 -
arch/s390/include/uapi/asm/ioctl.h | 1 -
arch/s390/include/uapi/asm/mman.h | 6 ------
arch/s390/include/uapi/asm/param.h | 6 ------
arch/s390/include/uapi/asm/poll.h | 1 -
arch/s390/include/uapi/asm/resource.h | 13 -------------
arch/s390/include/uapi/asm/sockios.h | 6 ------
arch/s390/include/uapi/asm/termbits.h | 6 ------
10 files changed, 10 insertions(+), 60 deletions(-)
delete mode 100644 arch/s390/include/uapi/asm/errno.h
delete mode 100644 arch/s390/include/uapi/asm/fcntl.h
delete mode 100644 arch/s390/include/uapi/asm/ioctl.h
delete mode 100644 arch/s390/include/uapi/asm/mman.h
delete mode 100644 arch/s390/include/uapi/asm/param.h
delete mode 100644 arch/s390/include/uapi/asm/poll.h
delete mode 100644 arch/s390/include/uapi/asm/resource.h
delete mode 100644 arch/s390/include/uapi/asm/sockios.h
delete mode 100644 arch/s390/include/uapi/asm/termbits.h
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 7bf68ff..e364de2 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -9,23 +9,16 @@ header-y += chsc.h
header-y += cmb.h
header-y += dasd.h
header-y += debug.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
header-y += ioctls.h
header-y += ipcbuf.h
header-y += kvm.h
header-y += kvm_para.h
header-y += kvm_virtio.h
-header-y += mman.h
header-y += monwriter.h
header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
header-y += posix_types.h
header-y += ptrace.h
header-y += qeth.h
-header-y += resource.h
header-y += schid.h
header-y += sembuf.h
header-y += setup.h
@@ -34,15 +27,23 @@ header-y += sigcontext.h
header-y += siginfo.h
header-y += signal.h
header-y += socket.h
-header-y += sockios.h
header-y += stat.h
header-y += statfs.h
header-y += swab.h
header-y += tape390.h
-header-y += termbits.h
header-y += termios.h
header-y += types.h
header-y += ucontext.h
header-y += unistd.h
header-y += vtoc.h
header-y += zcrypt.h
+
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += mman.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sockios.h
+generic-y += termbits.h
diff --git a/arch/s390/include/uapi/asm/errno.h b/arch/s390/include/uapi/asm/errno.h
deleted file mode 100644
index 395e97d..0000000
--- a/arch/s390/include/uapi/asm/errno.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * S390 version
- *
- */
-
-#ifndef _S390_ERRNO_H
-#define _S390_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/arch/s390/include/uapi/asm/fcntl.h b/arch/s390/include/uapi/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/s390/include/uapi/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/s390/include/uapi/asm/ioctl.h b/arch/s390/include/uapi/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/s390/include/uapi/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/s390/include/uapi/asm/mman.h b/arch/s390/include/uapi/asm/mman.h
deleted file mode 100644
index de23da1..0000000
--- a/arch/s390/include/uapi/asm/mman.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * S390 version
- *
- * Derived from "include/asm-i386/mman.h"
- */
-#include <asm-generic/mman.h>
diff --git a/arch/s390/include/uapi/asm/param.h b/arch/s390/include/uapi/asm/param.h
deleted file mode 100644
index c616821..0000000
--- a/arch/s390/include/uapi/asm/param.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASMS390_PARAM_H
-#define _ASMS390_PARAM_H
-
-#include <asm-generic/param.h>
-
-#endif /* _ASMS390_PARAM_H */
diff --git a/arch/s390/include/uapi/asm/poll.h b/arch/s390/include/uapi/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/s390/include/uapi/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/s390/include/uapi/asm/resource.h b/arch/s390/include/uapi/asm/resource.h
deleted file mode 100644
index ec23d1c..0000000
--- a/arch/s390/include/uapi/asm/resource.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * S390 version
- *
- * Derived from "include/asm-i386/resources.h"
- */
-
-#ifndef _S390_RESOURCE_H
-#define _S390_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
-
diff --git a/arch/s390/include/uapi/asm/sockios.h b/arch/s390/include/uapi/asm/sockios.h
deleted file mode 100644
index 6f60eee..0000000
--- a/arch/s390/include/uapi/asm/sockios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_SOCKIOS_H
-#define _ASM_S390_SOCKIOS_H
-
-#include <asm-generic/sockios.h>
-
-#endif
diff --git a/arch/s390/include/uapi/asm/termbits.h b/arch/s390/include/uapi/asm/termbits.h
deleted file mode 100644
index 71bf6ac..0000000
--- a/arch/s390/include/uapi/asm/termbits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_TERMBITS_H
-#define _ASM_S390_TERMBITS_H
-
-#include <asm-generic/termbits.h>
-
-#endif
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] s390: Automatically generate trivial UAPI headers
2012-10-11 16:18 ` [PATCH 3/4] s390: Automatically generate trivial UAPI headers Catalin Marinas
@ 2012-10-11 16:18 ` Catalin Marinas
0 siblings, 0 replies; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:18 UTC (permalink / raw)
To: linux-arch, linux-kernel
Cc: David Howells, Martin Schwidefsky, Heiko Carstens
This patch removes several trivial UAPI headers that were simply including
the asm-generic files as they can be automatically generated.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/s390/include/uapi/asm/Kbuild | 19 ++++++++++---------
arch/s390/include/uapi/asm/errno.h | 11 -----------
arch/s390/include/uapi/asm/fcntl.h | 1 -
arch/s390/include/uapi/asm/ioctl.h | 1 -
arch/s390/include/uapi/asm/mman.h | 6 ------
arch/s390/include/uapi/asm/param.h | 6 ------
arch/s390/include/uapi/asm/poll.h | 1 -
arch/s390/include/uapi/asm/resource.h | 13 -------------
arch/s390/include/uapi/asm/sockios.h | 6 ------
arch/s390/include/uapi/asm/termbits.h | 6 ------
10 files changed, 10 insertions(+), 60 deletions(-)
delete mode 100644 arch/s390/include/uapi/asm/errno.h
delete mode 100644 arch/s390/include/uapi/asm/fcntl.h
delete mode 100644 arch/s390/include/uapi/asm/ioctl.h
delete mode 100644 arch/s390/include/uapi/asm/mman.h
delete mode 100644 arch/s390/include/uapi/asm/param.h
delete mode 100644 arch/s390/include/uapi/asm/poll.h
delete mode 100644 arch/s390/include/uapi/asm/resource.h
delete mode 100644 arch/s390/include/uapi/asm/sockios.h
delete mode 100644 arch/s390/include/uapi/asm/termbits.h
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 7bf68ff..e364de2 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -9,23 +9,16 @@ header-y += chsc.h
header-y += cmb.h
header-y += dasd.h
header-y += debug.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
header-y += ioctls.h
header-y += ipcbuf.h
header-y += kvm.h
header-y += kvm_para.h
header-y += kvm_virtio.h
-header-y += mman.h
header-y += monwriter.h
header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
header-y += posix_types.h
header-y += ptrace.h
header-y += qeth.h
-header-y += resource.h
header-y += schid.h
header-y += sembuf.h
header-y += setup.h
@@ -34,15 +27,23 @@ header-y += sigcontext.h
header-y += siginfo.h
header-y += signal.h
header-y += socket.h
-header-y += sockios.h
header-y += stat.h
header-y += statfs.h
header-y += swab.h
header-y += tape390.h
-header-y += termbits.h
header-y += termios.h
header-y += types.h
header-y += ucontext.h
header-y += unistd.h
header-y += vtoc.h
header-y += zcrypt.h
+
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += mman.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sockios.h
+generic-y += termbits.h
diff --git a/arch/s390/include/uapi/asm/errno.h b/arch/s390/include/uapi/asm/errno.h
deleted file mode 100644
index 395e97d..0000000
--- a/arch/s390/include/uapi/asm/errno.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * S390 version
- *
- */
-
-#ifndef _S390_ERRNO_H
-#define _S390_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/arch/s390/include/uapi/asm/fcntl.h b/arch/s390/include/uapi/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/s390/include/uapi/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/s390/include/uapi/asm/ioctl.h b/arch/s390/include/uapi/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/s390/include/uapi/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/s390/include/uapi/asm/mman.h b/arch/s390/include/uapi/asm/mman.h
deleted file mode 100644
index de23da1..0000000
--- a/arch/s390/include/uapi/asm/mman.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * S390 version
- *
- * Derived from "include/asm-i386/mman.h"
- */
-#include <asm-generic/mman.h>
diff --git a/arch/s390/include/uapi/asm/param.h b/arch/s390/include/uapi/asm/param.h
deleted file mode 100644
index c616821..0000000
--- a/arch/s390/include/uapi/asm/param.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASMS390_PARAM_H
-#define _ASMS390_PARAM_H
-
-#include <asm-generic/param.h>
-
-#endif /* _ASMS390_PARAM_H */
diff --git a/arch/s390/include/uapi/asm/poll.h b/arch/s390/include/uapi/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/s390/include/uapi/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/s390/include/uapi/asm/resource.h b/arch/s390/include/uapi/asm/resource.h
deleted file mode 100644
index ec23d1c..0000000
--- a/arch/s390/include/uapi/asm/resource.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * S390 version
- *
- * Derived from "include/asm-i386/resources.h"
- */
-
-#ifndef _S390_RESOURCE_H
-#define _S390_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
-
diff --git a/arch/s390/include/uapi/asm/sockios.h b/arch/s390/include/uapi/asm/sockios.h
deleted file mode 100644
index 6f60eee..0000000
--- a/arch/s390/include/uapi/asm/sockios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_SOCKIOS_H
-#define _ASM_S390_SOCKIOS_H
-
-#include <asm-generic/sockios.h>
-
-#endif
diff --git a/arch/s390/include/uapi/asm/termbits.h b/arch/s390/include/uapi/asm/termbits.h
deleted file mode 100644
index 71bf6ac..0000000
--- a/arch/s390/include/uapi/asm/termbits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_TERMBITS_H
-#define _ASM_S390_TERMBITS_H
-
-#include <asm-generic/termbits.h>
-
-#endif
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] sparc: Automatically generate trivial UAPI headers
2012-10-11 16:18 [PATCH 0/4] uapi: Allow automatic generation of trivial headers Catalin Marinas
` (2 preceding siblings ...)
2012-10-11 16:18 ` [PATCH 3/4] s390: Automatically generate trivial UAPI headers Catalin Marinas
@ 2012-10-11 16:18 ` Catalin Marinas
2012-10-11 19:13 ` David Miller
2012-10-11 16:46 ` [PATCH 0/4] uapi: Allow automatic generation of trivial headers David Howells
4 siblings, 1 reply; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:18 UTC (permalink / raw)
To: linux-arch, linux-kernel; +Cc: David Howells, David S. Miller
This patch removes several trivial UAPI headers that were simply including
the asm-generic files as they can be automatically generated.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: "David S. Miller" <davem@davemloft.net>
---
arch/sparc/include/uapi/asm/Kbuild | 5 +++--
arch/sparc/include/uapi/asm/kvm_para.h | 1 -
arch/sparc/include/uapi/asm/statfs.h | 6 ------
3 files changed, 3 insertions(+), 9 deletions(-)
delete mode 100644 arch/sparc/include/uapi/asm/kvm_para.h
delete mode 100644 arch/sparc/include/uapi/asm/statfs.h
diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild
index ce175af..c7a460f 100644
--- a/arch/sparc/include/uapi/asm/Kbuild
+++ b/arch/sparc/include/uapi/asm/Kbuild
@@ -17,7 +17,6 @@ header-y += ioctl.h
header-y += ioctls.h
header-y += ipcbuf.h
header-y += jsflash.h
-header-y += kvm_para.h
header-y += mman.h
header-y += msgbuf.h
header-y += openpromio.h
@@ -39,7 +38,6 @@ header-y += signal.h
header-y += socket.h
header-y += sockios.h
header-y += stat.h
-header-y += statfs.h
header-y += swab.h
header-y += termbits.h
header-y += termios.h
@@ -49,3 +47,6 @@ header-y += uctx.h
header-y += unistd.h
header-y += utrap.h
header-y += watchdog.h
+
+generic-y += kvm_para.h
+generic-y += statfs.h
diff --git a/arch/sparc/include/uapi/asm/kvm_para.h b/arch/sparc/include/uapi/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/sparc/include/uapi/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/sparc/include/uapi/asm/statfs.h b/arch/sparc/include/uapi/asm/statfs.h
deleted file mode 100644
index 55e607a..0000000
--- a/arch/sparc/include/uapi/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef ___ASM_SPARC_STATFS_H
-#define ___ASM_SPARC_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 0/4] uapi: Allow automatic generation of trivial headers
2012-10-11 16:18 [PATCH 0/4] uapi: Allow automatic generation of trivial headers Catalin Marinas
` (3 preceding siblings ...)
2012-10-11 16:18 ` [PATCH 4/4] sparc: " Catalin Marinas
@ 2012-10-11 16:46 ` David Howells
2012-10-11 16:52 ` Catalin Marinas
4 siblings, 1 reply; 10+ messages in thread
From: David Howells @ 2012-10-11 16:46 UTC (permalink / raw)
To: Catalin Marinas; +Cc: dhowells, linux-arch, linux-kernel
Catalin Marinas <catalin.marinas@arm.com> wrote:
> The asm/Kbuild allows automatic generation of header files by specifying
> "generic-y += ...". The first patch in the series allows the same thing
> to be specified in uapi/asm/Kbuild.
>
> The subsequent patches remove some of the trivial header files in arm64,
> s390 and sparc. Please note that the series has only been tested on
> arm64. I can test the others but not until tomorrow.
It should be noted that the arm64 patch is dependent on the disintegrate-arm64
branch of my UAPI disintegration patches, which I don't believe is upstream
yet.
David
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/4] uapi: Allow automatic generation of trivial headers
2012-10-11 16:46 ` [PATCH 0/4] uapi: Allow automatic generation of trivial headers David Howells
@ 2012-10-11 16:52 ` Catalin Marinas
0 siblings, 0 replies; 10+ messages in thread
From: Catalin Marinas @ 2012-10-11 16:52 UTC (permalink / raw)
To: David Howells; +Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
On Thu, Oct 11, 2012 at 05:46:40PM +0100, David Howells wrote:
> Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> > The asm/Kbuild allows automatic generation of header files by specifying
> > "generic-y += ...". The first patch in the series allows the same thing
> > to be specified in uapi/asm/Kbuild.
> >
> > The subsequent patches remove some of the trivial header files in arm64,
> > s390 and sparc. Please note that the series has only been tested on
> > arm64. I can test the others but not until tomorrow.
>
> It should be noted that the arm64 patch is dependent on the disintegrate-arm64
> branch of my UAPI disintegration patches, which I don't believe is upstream
> yet.
Not yet. But this series is not meant for this merging window anyway.
--
Catalin
^ permalink raw reply [flat|nested] 10+ messages in thread