am 4d6e7a3b: am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused"
* commit '4d6e7a3b9f929767596c5a77781a9fa7d1fd9706': Replace __unused in linux/sysctl.h with __linux_unused
This commit is contained in:
@@ -66,7 +66,7 @@ struct icmphdr {
|
|||||||
} echo;
|
} echo;
|
||||||
__u32 gateway;
|
__u32 gateway;
|
||||||
struct {
|
struct {
|
||||||
__u16 __unused_field;
|
__u16 __linux_unused;
|
||||||
__u16 mtu;
|
__u16 mtu;
|
||||||
} frag;
|
} frag;
|
||||||
} un;
|
} un;
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ struct __sysctl_args {
|
|||||||
size_t __user *oldlenp;
|
size_t __user *oldlenp;
|
||||||
void __user *newval;
|
void __user *newval;
|
||||||
size_t newlen;
|
size_t newlen;
|
||||||
unsigned long __unused[4];
|
unsigned long __linux_unused[4];
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
|||||||
Reference in New Issue
Block a user