Patchwork [28/28] update-linux-headers.sh: Handle new kernel uapi/ directories

login
register
mail settings
Submitter Marcelo Tosatti
Date Oct. 31, 2012, 9:40 a.m.
Message ID <b55f546eefe79cb6e6b15ebb23f352a736bafc39.1351676406.git.mtosatti@redhat.com>
Download mbox | patch
Permalink /patch/195828/
State New
Headers show

Comments

Marcelo Tosatti - Oct. 31, 2012, 9:40 a.m.
From: Peter Maydell <peter.maydell@linaro.org>

Recent kernels have moved to keeping the userspace headers
in uapi/ subdirectories. This breaks the detection of whether an
architecture has KVM support in the kernel because kvm.h has
moved in the kernel source tree. Update the check to support
both the old and new locations.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
 scripts/update-linux-headers.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 67be2ef..4c7b566 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -34,7 +34,8 @@  ARCHLIST=$(cd "$linux/arch" && echo *)
 
 for arch in $ARCHLIST; do
     # Discard anything which isn't a KVM-supporting architecture
-    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
+    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] &&
+        ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then
         continue
     fi