diff mbox

[v7,1/8] scripts: Allow include "stdint.h" in virtio headers

Message ID 1440746120-21577-2-git-send-email-gwshan@linux.vnet.ibm.com
State New
Headers show

Commit Message

Gavin Shan Aug. 28, 2015, 7:15 a.m. UTC
This allows to include "stdint.h" in virtio header files. Otherwise,
scripts/update-linux-headers.sh fails when updating headers from
Linux 4.2.rc8 kernel. include/uapi/linux/virtio_ring.h starts to
include "stdint.h" from commit d768f32a ("virtio: Fix typecast of
pointer in vring_init()").

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 scripts/update-linux-headers.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

David Gibson Sept. 1, 2015, 12:50 a.m. UTC | #1
On Fri, Aug 28, 2015 at 05:15:13PM +1000, Gavin Shan wrote:
> This allows to include "stdint.h" in virtio header files. Otherwise,
> scripts/update-linux-headers.sh fails when updating headers from
> Linux 4.2.rc8 kernel. include/uapi/linux/virtio_ring.h starts to
> include "stdint.h" from commit d768f32a ("virtio: Fix typecast of
> pointer in vring_init()").
> 
> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>


> ---
>  scripts/update-linux-headers.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index f0e830c..2fddf2e 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -37,7 +37,8 @@ cp_virtio() {
>          mkdir -p "$to"
>          for f in $virtio; do
>              if
> -                grep '#include' "$f" | grep -v -e 'linux/virtio' \
> +                grep '#include' "$f" | grep -v -e 'stdint' \
> +                                             -e 'linux/virtio' \
>                                               -e 'linux/types' \
>                                               -e 'linux/if_ether' \
>                                               -e 'sys/' \
diff mbox

Patch

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index f0e830c..2fddf2e 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -37,7 +37,8 @@  cp_virtio() {
         mkdir -p "$to"
         for f in $virtio; do
             if
-                grep '#include' "$f" | grep -v -e 'linux/virtio' \
+                grep '#include' "$f" | grep -v -e 'stdint' \
+                                             -e 'linux/virtio' \
                                              -e 'linux/types' \
                                              -e 'linux/if_ether' \
                                              -e 'sys/' \