Revert "ethtool: change to new sane powerpc64 kernel headers"
diff mbox series

Message ID 20190130024849.24997-1-zenczykowski@gmail.com
State Accepted
Delegated to: John Linville
Headers show
Series
  • Revert "ethtool: change to new sane powerpc64 kernel headers"
Related show

Commit Message

Maciej Żenczykowski Jan. 30, 2019, 2:48 a.m. UTC
From: Maciej Żenczykowski <maze@google.com>

This reverts commit 4df55c81996dfb1dbe98c93ee62d8067ed5073a9.

It turns out this is not needed due to:
    commit c0a2c04b3cbf6d399a2551654401957ddb529a50
    internal.h: change to new sane kernel headers on 64-bit archs
which I apparently entirely forgot about while trying
to synchronize internal and upstream git repositories.

Change-Id: I56d90a3c1e9b66c30526824fb7bc41aab01d85d1
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
 ethtool-copy.h | 6 ------
 1 file changed, 6 deletions(-)

Comments

John W. Linville Jan. 30, 2019, 8:41 p.m. UTC | #1
Cool, thanks -- queued for next release.

John

On Tue, Jan 29, 2019 at 06:48:49PM -0800, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
> 
> This reverts commit 4df55c81996dfb1dbe98c93ee62d8067ed5073a9.
> 
> It turns out this is not needed due to:
>     commit c0a2c04b3cbf6d399a2551654401957ddb529a50
>     internal.h: change to new sane kernel headers on 64-bit archs
> which I apparently entirely forgot about while trying
> to synchronize internal and upstream git repositories.
> 
> Change-Id: I56d90a3c1e9b66c30526824fb7bc41aab01d85d1
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
> ---
>  ethtool-copy.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/ethtool-copy.h b/ethtool-copy.h
> index 7772a4970987..6bfbb85f9402 100644
> --- a/ethtool-copy.h
> +++ b/ethtool-copy.h
> @@ -14,12 +14,6 @@
>  #ifndef _LINUX_ETHTOOL_H
>  #define _LINUX_ETHTOOL_H
>  
> -#ifdef __powerpc64__
> -/* Powerpc needs __SANE_USERSPACE_TYPES__ before <linux/types.h> to select
> - * 'int-ll64.h' and avoid compile warnings when printing __u64 with %llu.
> - */
> -#define __SANE_USERSPACE_TYPES__
> -#endif
>  #include <linux/kernel.h>
>  #include <linux/types.h>
>  #include <linux/if_ether.h>
> -- 
> 2.20.1.495.gaa96b0ce6b-goog
> 
>

Patch
diff mbox series

diff --git a/ethtool-copy.h b/ethtool-copy.h
index 7772a4970987..6bfbb85f9402 100644
--- a/ethtool-copy.h
+++ b/ethtool-copy.h
@@ -14,12 +14,6 @@ 
 #ifndef _LINUX_ETHTOOL_H
 #define _LINUX_ETHTOOL_H
 
-#ifdef __powerpc64__
-/* Powerpc needs __SANE_USERSPACE_TYPES__ before <linux/types.h> to select
- * 'int-ll64.h' and avoid compile warnings when printing __u64 with %llu.
- */
-#define __SANE_USERSPACE_TYPES__
-#endif
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/if_ether.h>