* (no subject)
@ 2012-10-06 23:15 ` David Howells
0 siblings, 0 replies; 4+ messages in thread
From: David Howells @ 2012-10-06 23:15 UTC (permalink / raw)
To: torvalds
Cc: dhowells, arnd, hpa, catalin.marinas, linux-arch, linux-kernel,
geert, ralf, ddaney.cavm
[-- Attachment #1: Type: text/plain, Size: 3555 bytes --]
Hi Linus,
Could you pull this branch please? It contains some fixups for the UAPI stuff.
There are four main parts:
(1) I found I needed some more fixups in the wake of testing Arm64 (some
asm/unistd.h files had weird guards that caused problems - mostly in
arches for which I don't have a compiler) and some __KERNEL__ splitting
needed to take place in Arm64.
(2) I found that c6x was missing some __KERNEL__ guards in its asm/signal.h.
Mark Salter pointed me at a tree with a patch to remove that file
entirely and use the asm-generic variant instead. I pulled his tree
since it also give me a defconfig for c6x to use in testing.
(3) m68k turned out to have a header installation problem due to it lacking a
kvm_para.h file.
The conditional installation bits for linux/kvm_para.h, linux/kvm.h and
linux/a.out.h weren't very well specified - and didn't work if an arch
didn't have the asm/ version of that file, but there *was* an
asm-generic/ version.
It seems the "ifneq $((wildcard ...),)" for each of those three headers
in include/kernel/Kbuild is invoked twice during header installation, and
the second time it matches on the just installed asm-generic/kvm_para.h
file and thus incorrectly installs linux/kvm_para.h as well.
Most arches actually have an asm/kvm_para.h, so this wasn't detectable in
those.
(4) Fix problems with libfdt.h by reverting the changes to that particular
header file.
Signed-off-by: David Howells <dhowells@redhat.com>
---
The following changes since commit 612a9aab56a93533e76e3ad91642db7033e03b69:
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (2012-10-03 23:29:23 -0700)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/uapi-prep-20121007
for you to fetch changes up to cb6c88a13060f67ce556a06e279fadf46cc7f244:
UAPI: Fix libfdt.h's #includes (2012-10-07 00:05:00 +0100)
----------------------------------------------------------------
(from the branch description for uapi-prep local branch)
clone of "master"
UAPI prep branch on 2012-10-07
----------------------------------------------------------------
David Howells (5):
UAPI: Fix the guards on various asm/unistd.h files
UAPI: Split compound conditionals containing __KERNEL__ in Arm64
Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep
UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
UAPI: Fix libfdt.h's #includes
Mark Salter (2):
c6x: make dsk6455 the default config
c6x: remove c6x signal.h
arch/arm64/include/asm/hwcap.h | 4 +++-
arch/arm64/include/asm/stat.h | 4 +++-
arch/arm64/include/asm/unistd.h | 8 +++-----
arch/arm64/include/asm/unistd32.h | 4 ----
arch/c6x/Makefile | 2 ++
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/signal.h | 17 -----------------
arch/c6x/include/asm/unistd.h | 4 ----
arch/hexagon/include/asm/unistd.h | 5 -----
arch/openrisc/include/asm/unistd.h | 5 -----
arch/score/include/asm/unistd.h | 5 -----
arch/tile/include/asm/unistd.h | 5 -----
arch/unicore32/include/asm/unistd.h | 4 ----
include/asm-generic/unistd.h | 4 ----
include/linux/Kbuild | 9 +++------
include/linux/libfdt.h | 4 ++--
16 files changed, 17 insertions(+), 68 deletions(-)
delete mode 100644 arch/c6x/include/asm/signal.h
[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* (unknown),
@ 2012-10-06 23:15 ` David Howells
0 siblings, 0 replies; 4+ messages in thread
From: David Howells @ 2012-10-06 23:15 UTC (permalink / raw)
To: torvalds
Cc: dhowells, arnd, hpa, catalin.marinas, linux-arch, linux-kernel,
geert, ralf, ddaney.cavm
[-- Attachment #1: Type: text/plain, Size: 3555 bytes --]
Hi Linus,
Could you pull this branch please? It contains some fixups for the UAPI stuff.
There are four main parts:
(1) I found I needed some more fixups in the wake of testing Arm64 (some
asm/unistd.h files had weird guards that caused problems - mostly in
arches for which I don't have a compiler) and some __KERNEL__ splitting
needed to take place in Arm64.
(2) I found that c6x was missing some __KERNEL__ guards in its asm/signal.h.
Mark Salter pointed me at a tree with a patch to remove that file
entirely and use the asm-generic variant instead. I pulled his tree
since it also give me a defconfig for c6x to use in testing.
(3) m68k turned out to have a header installation problem due to it lacking a
kvm_para.h file.
The conditional installation bits for linux/kvm_para.h, linux/kvm.h and
linux/a.out.h weren't very well specified - and didn't work if an arch
didn't have the asm/ version of that file, but there *was* an
asm-generic/ version.
It seems the "ifneq $((wildcard ...),)" for each of those three headers
in include/kernel/Kbuild is invoked twice during header installation, and
the second time it matches on the just installed asm-generic/kvm_para.h
file and thus incorrectly installs linux/kvm_para.h as well.
Most arches actually have an asm/kvm_para.h, so this wasn't detectable in
those.
(4) Fix problems with libfdt.h by reverting the changes to that particular
header file.
Signed-off-by: David Howells <dhowells@redhat.com>
---
The following changes since commit 612a9aab56a93533e76e3ad91642db7033e03b69:
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (2012-10-03 23:29:23 -0700)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/uapi-prep-20121007
for you to fetch changes up to cb6c88a13060f67ce556a06e279fadf46cc7f244:
UAPI: Fix libfdt.h's #includes (2012-10-07 00:05:00 +0100)
----------------------------------------------------------------
(from the branch description for uapi-prep local branch)
clone of "master"
UAPI prep branch on 2012-10-07
----------------------------------------------------------------
David Howells (5):
UAPI: Fix the guards on various asm/unistd.h files
UAPI: Split compound conditionals containing __KERNEL__ in Arm64
Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep
UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
UAPI: Fix libfdt.h's #includes
Mark Salter (2):
c6x: make dsk6455 the default config
c6x: remove c6x signal.h
arch/arm64/include/asm/hwcap.h | 4 +++-
arch/arm64/include/asm/stat.h | 4 +++-
arch/arm64/include/asm/unistd.h | 8 +++-----
arch/arm64/include/asm/unistd32.h | 4 ----
arch/c6x/Makefile | 2 ++
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/signal.h | 17 -----------------
arch/c6x/include/asm/unistd.h | 4 ----
arch/hexagon/include/asm/unistd.h | 5 -----
arch/openrisc/include/asm/unistd.h | 5 -----
arch/score/include/asm/unistd.h | 5 -----
arch/tile/include/asm/unistd.h | 5 -----
arch/unicore32/include/asm/unistd.h | 4 ----
include/asm-generic/unistd.h | 4 ----
include/linux/Kbuild | 9 +++------
include/linux/libfdt.h | 4 ++--
16 files changed, 17 insertions(+), 68 deletions(-)
delete mode 100644 arch/c6x/include/asm/signal.h
[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re:
2012-10-06 23:15 ` (unknown), David Howells
(?)
@ 2012-10-07 6:36 ` Geert Uytterhoeven
2012-10-11 9:57 ` Re: Will Deacon
-1 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2012-10-07 6:36 UTC (permalink / raw)
To: David Howells
Cc: torvalds, arnd, hpa, catalin.marinas, linux-arch, linux-kernel,
ralf, ddaney.cavm, Paul Mundt
On Sun, Oct 7, 2012 at 1:15 AM, David Howells <dhowells@redhat.com> wrote:
> (3) m68k turned out to have a header installation problem due to it lacking a
> kvm_para.h file.
Sh also.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re:
2012-10-07 6:36 ` Geert Uytterhoeven
@ 2012-10-11 9:57 ` Will Deacon
0 siblings, 0 replies; 4+ messages in thread
From: Will Deacon @ 2012-10-11 9:57 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: David Howells, torvalds, arnd, hpa, Catalin Marinas, linux-arch,
linux-kernel, ralf, ddaney.cavm, Paul Mundt
On Sun, Oct 07, 2012 at 07:36:20AM +0100, Geert Uytterhoeven wrote:
> On Sun, Oct 7, 2012 at 1:15 AM, David Howells <dhowells@redhat.com> wrote:
> > (3) m68k turned out to have a header installation problem due to it lacking a
> > kvm_para.h file.
>
> Sh also.
and arm64 iirc. It should also affect arm, but we have a horrible dummy
header to get around it (just includes the asm-generic variant).
I posted a fix, but then it got derailed by the wildcarding used to generate
generic headers for kvm (which I was going some way to removing):
https://lkml.org/lkml/2012/8/2/173
http://marc.info/?l=linux-kernel&m=134393963216492&w=2
Will
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-11 9:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-06 23:15 David Howells
2012-10-06 23:15 ` (unknown), David Howells
2012-10-07 6:36 ` Geert Uytterhoeven
2012-10-11 9:57 ` Re: Will Deacon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.