Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: [PATCH] Revert "KVM: Export asm-generic/kvm_para.h" | Date | Wed, 18 Jul 2012 11:58:06 +0000 |
| |
On Wednesday 18 July 2012, Will Deacon wrote: > This reverts commit 56457f38f212344fb38b250cfa7e7311c065022f. > > For architectures without asm/kvm_para.h, asm-generic/Kbuild > unconditionally tries to export the non-existent header file, resulting > in failure to build the user headers. Since the logic in > asm-generic/Kbuild.asm will only export the file if it exists (which in > turn causes linux/kvm_para.h to be exported), we can just remove the > unconditional header export.
This doesn't look right.
> I'm not sure what specific problem the original commit was fixing, so we > may need to solve this another way if there's something I've missed. > > include/asm-generic/Kbuild | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild > index 2c85a0f..53f91b1 100644 > --- a/include/asm-generic/Kbuild > +++ b/include/asm-generic/Kbuild > @@ -8,7 +8,6 @@ header-y += int-ll64.h > header-y += ioctl.h > header-y += ioctls.h > header-y += ipcbuf.h > -header-y += kvm_para.h > header-y += mman-common.h > header-y += mman.h > header-y += msgbuf.h
include/asm-generic/Kbuild lists the header files in the asm-generic directory, and the asm-generic/kvm_para.h always exists, it's not architecture specific.
arch/arm/include/asm/kvm_para.h also always exists, it was added in 3b5d56b93 "kvmclock: Add functions to check if the host has stopped the vm", although it should have added that to the generated header files listed in arch/arm/include/asm/Kbuild.
I'm still not sure what you are actually trying to fix here.
Arnd
| |