diff options
| author | Elliott Hughes <enh@google.com> | 2023-04-11 01:10:48 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2023-04-11 01:10:48 +0000 |
| commit | 5ad26f4d716f18662ddb0f30f7677ee53b0378bb (patch) | |
| tree | 861ed2bb6cb27c6c92ec0f15122dede512ffbd48 /sysroots | |
| parent | ed9e3dea4e2a234cb4557280b7663dcbb2b5d288 (diff) | |
| download | build-tools-5ad26f4d716f18662ddb0f30f7677ee53b0378bb.tar.gz | |
Update build-tools to ab/9912868
https://ci.android.com/builds/branches/aosp-build-tools-release/grid?head=9912868&tail=9912868
Test: treehugger
Change-Id: I747d621fc9f009ff550b219e80a7884da66b1151
Diffstat (limited to 'sysroots')
386 files changed, 1808 insertions, 1712 deletions
diff --git a/sysroots/aarch64-unknown-linux-musl/NOTICE.bionic b/sysroots/aarch64-unknown-linux-musl/NOTICE.bionic index 9d555923..4d3a1086 100644 --- a/sysroots/aarch64-unknown-linux-musl/NOTICE.bionic +++ b/sysroots/aarch64-unknown-linux-musl/NOTICE.bionic @@ -894,6 +894,34 @@ SUCH DAMAGE. ------------------------------------------------------------------- +Copyright (C) 2023 The Android Open Source Project +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +------------------------------------------------------------------- + Copyright (c) 1980, 1983, 1988, 1993 The Regents of the University of California. All rights reserved. diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-arm/asm/signal.h b/sysroots/aarch64-unknown-linux-musl/include/asm-arm/asm/signal.h index 04243808..90cb8d6a 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-arm/asm/signal.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-arm/asm/signal.h @@ -76,7 +76,7 @@ struct sigaction { #define sa_handler _u._sa_handler #define sa_sigaction _u._sa_sigaction typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-arm64/asm/kvm.h b/sysroots/aarch64-unknown-linux-musl/include/asm-arm64/asm/kvm.h index ecc2e011..ce0c3188 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-arm64/asm/kvm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-arm64/asm/kvm.h @@ -121,7 +121,7 @@ struct kvm_vcpu_events { struct kvm_arm_copy_mte_tags { __u64 guest_ipa; __u64 length; - void __user * addr; + void * addr; __u64 flags; __u64 reserved[2]; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/poll.h b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/poll.h index 372bc773..ba6f2e9e 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/poll.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/poll.h @@ -41,8 +41,8 @@ #ifndef POLLRDHUP #define POLLRDHUP 0x2000 #endif -#define POLLFREE (__force __poll_t) 0x4000 -#define POLL_BUSY_LOOP (__force __poll_t) 0x8000 +#define POLLFREE ( __poll_t) 0x4000 +#define POLL_BUSY_LOOP ( __poll_t) 0x8000 struct pollfd { int fd; short events; diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/siginfo.h b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/siginfo.h index c5e4178b..90393bab 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/siginfo.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/siginfo.h @@ -22,7 +22,7 @@ #include <linux/types.h> typedef union sigval { int sival_int; - void __user * sival_ptr; + void * sival_ptr; } sigval_t; #define SI_MAX_SIZE 128 #ifndef __ARCH_SI_BAND_T @@ -58,7 +58,7 @@ union __sifields { __ARCH_SI_CLOCK_T _stime; } _sigchld; struct { - void __user * _addr; + void * _addr; #ifdef __ia64__ int _imm; unsigned int _flags; @@ -70,8 +70,8 @@ union __sifields { short _addr_lsb; struct { char _dummy_bnd[__ADDR_BND_PKEY_PAD]; - void __user * _lower; - void __user * _upper; + void * _lower; + void * _upper; } _addr_bnd; struct { char _dummy_pkey[__ADDR_BND_PKEY_PAD]; @@ -89,7 +89,7 @@ union __sifields { int _fd; } _sigpoll; struct { - void __user * _call_addr; + void * _call_addr; int _syscall; unsigned int _arch; } _sigsys; diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal-defs.h b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal-defs.h index c7e95040..dea8fbca 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal-defs.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal-defs.h @@ -55,11 +55,11 @@ #endif #ifndef __ASSEMBLY__ typedef void __signalfn_t(int); -typedef __signalfn_t __user * __sighandler_t; +typedef __signalfn_t * __sighandler_t; typedef void __restorefn_t(void); -typedef __restorefn_t __user * __sigrestore_t; -#define SIG_DFL ((__force __sighandler_t) 0) -#define SIG_IGN ((__force __sighandler_t) 1) -#define SIG_ERR ((__force __sighandler_t) - 1) +typedef __restorefn_t * __sigrestore_t; +#define SIG_DFL (( __sighandler_t) 0) +#define SIG_IGN (( __sighandler_t) 1) +#define SIG_ERR (( __sighandler_t) - 1) #endif #endif diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal.h b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal.h index 5cb1dce4..9cf393ff 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-generic/signal.h @@ -82,7 +82,7 @@ struct sigaction { sigset_t sa_mask; }; typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h b/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h index 7d5b4d4d..c7909505 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h @@ -180,7 +180,7 @@ struct sigcontext { __u32 eflags; __u32 esp_at_signal; __u16 ss, __ssh; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; __u32 oldmask; __u32 cr2; }; @@ -215,7 +215,7 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; #ifdef __ILP32__ __u32 __fpstate_pad; #endif diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/signal.h b/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/signal.h index cbeeac46..37dce50d 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/signal.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm-x86/asm/signal.h @@ -88,7 +88,7 @@ struct sigaction { }; #endif typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/aarch64-unknown-linux-musl/include/asm/kvm.h b/sysroots/aarch64-unknown-linux-musl/include/asm/kvm.h index ecc2e011..ce0c3188 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/asm/kvm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/asm/kvm.h @@ -121,7 +121,7 @@ struct kvm_vcpu_events { struct kvm_arm_copy_mte_tags { __u64 guest_ipa; __u64 length; - void __user * addr; + void * addr; __u64 flags; __u64 reserved[2]; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/drm.h index 878e899e..19544525 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/drm.h @@ -78,19 +78,19 @@ struct drm_version { int version_minor; int version_patchlevel; __kernel_size_t name_len; - char __user * name; + char * name; __kernel_size_t date_len; - char __user * date; + char * date; __kernel_size_t desc_len; - char __user * desc; + char * desc; }; struct drm_unique { __kernel_size_t unique_len; - char __user * unique; + char * unique; }; struct drm_list { int count; - struct drm_version __user * version; + struct drm_version * version; }; struct drm_block { int unused; @@ -202,37 +202,37 @@ struct drm_buf_desc { }; struct drm_buf_info { int count; - struct drm_buf_desc __user * list; + struct drm_buf_desc * list; }; struct drm_buf_free { int count; - int __user * list; + int * list; }; struct drm_buf_pub { int idx; int total; int used; - void __user * address; + void * address; }; struct drm_buf_map { int count; #ifdef __cplusplus - void __user * virt; + void * virt; #else - void __user * __linux_virtual; + void * __linux_virtual; #endif - struct drm_buf_pub __user * list; + struct drm_buf_pub * list; }; struct drm_dma { int context; int send_count; - int __user * send_indices; - int __user * send_sizes; + int * send_indices; + int * send_sizes; enum drm_dma_flags flags; int request_count; int request_size; - int __user * request_indices; - int __user * request_sizes; + int * request_indices; + int * request_sizes; int granted_count; }; enum drm_ctx_flags { @@ -245,7 +245,7 @@ struct drm_ctx { }; struct drm_ctx_res { int count; - struct drm_ctx __user * contexts; + struct drm_ctx * contexts; }; struct drm_draw { drm_drawable_t handle; diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/i915_drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/i915_drm.h index a8982bf5..794e7849 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/i915_drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/i915_drm.h @@ -287,18 +287,18 @@ typedef struct drm_i915_batchbuffer { int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_batchbuffer_t; typedef struct _drm_i915_cmdbuffer { - char __user * buf; + char * buf; int sz; int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_cmdbuffer_t; typedef struct drm_i915_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_i915_irq_emit_t; typedef struct drm_i915_irq_wait { int irq_seq; @@ -371,7 +371,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_OA_TIMESTAMP_FREQUENCY 57 struct drm_i915_getparam { __s32 param; - int __user * value; + int * value; }; typedef struct drm_i915_getparam drm_i915_getparam_t; #define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1 @@ -387,7 +387,7 @@ typedef struct drm_i915_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_i915_mem_alloc_t; typedef struct drm_i915_mem_free { int region; diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/mga_drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/mga_drm.h index dc62961d..eb55fa7c 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/mga_drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/mga_drm.h @@ -239,7 +239,7 @@ typedef struct _drm_mga_blit { #define MGA_PARAM_CARD_TYPE 2 typedef struct drm_mga_getparam { int param; - void __user * value; + void * value; } drm_mga_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/r128_drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/r128_drm.h index 618b6dca..3e013b17 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/r128_drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/r128_drm.h @@ -204,13 +204,13 @@ typedef struct drm_r128_depth { R128_READ_PIXELS = 0x04 } func; int n; - int __user * x; - int __user * y; - unsigned int __user * buffer; - unsigned char __user * mask; + int * x; + int * y; + unsigned int * buffer; + unsigned char * mask; } drm_r128_depth_t; typedef struct drm_r128_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_r128_stipple_t; typedef struct drm_r128_indirect { int idx; @@ -227,7 +227,7 @@ typedef struct drm_r128_fullscreen { #define R128_PARAM_IRQ_NR 1 typedef struct drm_r128_getparam { int param; - void __user * value; + void * value; } drm_r128_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/radeon_drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/radeon_drm.h index 9dc69ad5..3ec6bb3f 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/radeon_drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/radeon_drm.h @@ -479,7 +479,7 @@ typedef struct drm_radeon_clear { unsigned int clear_depth; unsigned int color_mask; unsigned int depth_mask; - drm_radeon_clear_rect_t __user * depth_boxes; + drm_radeon_clear_rect_t * depth_boxes; } drm_radeon_clear_t; typedef struct drm_radeon_vertex { int prim; @@ -498,20 +498,20 @@ typedef struct drm_radeon_vertex2 { int idx; int discard; int nr_states; - drm_radeon_state_t __user * state; + drm_radeon_state_t * state; int nr_prims; - drm_radeon_prim_t __user * prim; + drm_radeon_prim_t * prim; } drm_radeon_vertex2_t; typedef struct drm_radeon_cmd_buffer { int bufsz; - char __user * buf; + char * buf; int nbox; - struct drm_clip_rect __user * boxes; + struct drm_clip_rect * boxes; } drm_radeon_cmd_buffer_t; typedef struct drm_radeon_tex_image { unsigned int x, y; unsigned int width, height; - const void __user * data; + const void * data; } drm_radeon_tex_image_t; typedef struct drm_radeon_texture { unsigned int offset; @@ -519,10 +519,10 @@ typedef struct drm_radeon_texture { int format; int width; int height; - drm_radeon_tex_image_t __user * image; + drm_radeon_tex_image_t * image; } drm_radeon_texture_t; typedef struct drm_radeon_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_radeon_stipple_t; typedef struct drm_radeon_indirect { int idx; @@ -552,7 +552,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_NUM_Z_PIPES 17 typedef struct drm_radeon_getparam { int param; - void __user * value; + void * value; } drm_radeon_getparam_t; #define RADEON_MEM_REGION_GART 1 #define RADEON_MEM_REGION_FB 2 @@ -560,7 +560,7 @@ typedef struct drm_radeon_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_radeon_mem_alloc_t; typedef struct drm_radeon_mem_free { int region; @@ -572,7 +572,7 @@ typedef struct drm_radeon_mem_init_heap { int start; } drm_radeon_mem_init_heap_t; typedef struct drm_radeon_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_radeon_irq_emit_t; typedef struct drm_radeon_irq_wait { int irq_seq; diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/savage_drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/savage_drm.h index ae87d21b..efc0ae6b 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/savage_drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/savage_drm.h @@ -68,14 +68,14 @@ typedef struct drm_savage_init { } drm_savage_init_t; typedef union drm_savage_cmd_header drm_savage_cmd_header_t; typedef struct drm_savage_cmdbuf { - drm_savage_cmd_header_t __user * cmd_addr; + drm_savage_cmd_header_t * cmd_addr; unsigned int size; unsigned int dma_idx; int discard; - unsigned int __user * vb_addr; + unsigned int * vb_addr; unsigned int vb_size; unsigned int vb_stride; - struct drm_clip_rect __user * box_addr; + struct drm_clip_rect * box_addr; unsigned int nbox; } drm_savage_cmdbuf_t; #define SAVAGE_WAIT_2D 0x1 diff --git a/sysroots/aarch64-unknown-linux-musl/include/drm/via_drm.h b/sysroots/aarch64-unknown-linux-musl/include/drm/via_drm.h index 9ef645a1..95a149b6 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/drm/via_drm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/drm/via_drm.h @@ -125,7 +125,7 @@ typedef struct _drm_via_dma_init { unsigned long reg_pause_addr; } drm_via_dma_init_t; typedef struct _drm_via_cmdbuffer { - char __user * buf; + char * buf; unsigned long size; } drm_via_cmdbuffer_t; typedef struct _drm_via_tex_region { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/atm.h b/sysroots/aarch64-unknown-linux-musl/include/linux/atm.h index 488fa05a..72d329df 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/atm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/atm.h @@ -140,7 +140,7 @@ struct sockaddr_atmsvc { struct atmif_sioc { int number; int length; - void __user * arg; + void * arg; }; typedef unsigned short atm_backend_t; #endif diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/atmdev.h b/sysroots/aarch64-unknown-linux-musl/include/linux/atmdev.h index 69eb2400..74cdfc14 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/atmdev.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/atmdev.h @@ -86,7 +86,7 @@ struct atm_dev_stats { #define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG) struct atm_iobuf { int length; - void __user * buffer; + void * buffer; }; #define ATM_CI_MAX - 1 struct atm_cirange { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/blkpg.h b/sysroots/aarch64-unknown-linux-musl/include/linux/blkpg.h index fdde696e..bfe504ff 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/blkpg.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/blkpg.h @@ -25,7 +25,7 @@ struct blkpg_ioctl_arg { int op; int flags; int datalen; - void __user * data; + void * data; }; #define BLKPG_ADD_PARTITION 1 #define BLKPG_DEL_PARTITION 2 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/btrfs.h b/sysroots/aarch64-unknown-linux-musl/include/linux/btrfs.h index 80396255..0fdac660 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/btrfs.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/btrfs.h @@ -79,7 +79,7 @@ struct btrfs_ioctl_vol_args_v2 { union { struct { __u64 size; - struct btrfs_qgroup_inherit __user * qgroup_inherit; + struct btrfs_qgroup_inherit * qgroup_inherit; }; __u64 unused[4]; }; @@ -432,7 +432,7 @@ struct btrfs_ioctl_received_subvol_args { struct btrfs_ioctl_send_args { __s64 send_fd; __u64 clone_sources_count; - __u64 __user * clone_sources; + __u64 * clone_sources; __u64 parent_root; __u64 flags; __u32 version; @@ -469,7 +469,7 @@ struct btrfs_ioctl_get_subvol_rootref_args { __u8 align[7]; }; struct btrfs_ioctl_encoded_io_args { - const struct iovec __user * iov; + const struct iovec * iov; unsigned long iovcnt; __s64 offset; __u64 flags; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/big_endian.h b/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/big_endian.h index b6c978b4..82c5a4cd 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/big_endian.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/big_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) (__u32) (x)) -#define __constant_ntohl(x) ((__force __u32) (__be32) (x)) -#define __constant_htons(x) ((__force __be16) (__u16) (x)) -#define __constant_ntohs(x) ((__force __u16) (__be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) ___constant_swab64((x))) -#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) ___constant_swab32((x))) -#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) ___constant_swab16((x))) -#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __constant_be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __constant_be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __constant_be16_to_cpu(x) ((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) __swab64((x))) -#define __le64_to_cpu(x) __swab64((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) __swab32((x))) -#define __le32_to_cpu(x) __swab32((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) __swab16((x))) -#define __le16_to_cpu(x) __swab16((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __be16_to_cpu(x) ((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) (__u32) (x)) +#define __constant_ntohl(x) (( __u32) (__be32) (x)) +#define __constant_htons(x) (( __be16) (__u16) (x)) +#define __constant_ntohs(x) (( __u16) (__be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) ___constant_swab64((x))) +#define __constant_le64_to_cpu(x) ___constant_swab64(( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) ___constant_swab32((x))) +#define __constant_le32_to_cpu(x) ___constant_swab32(( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) ___constant_swab16((x))) +#define __constant_le16_to_cpu(x) ___constant_swab16(( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __constant_be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __constant_be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __constant_be16_to_cpu(x) (( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) __swab64((x))) +#define __le64_to_cpu(x) __swab64(( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) __swab32((x))) +#define __le32_to_cpu(x) __swab32(( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) __swab16((x))) +#define __le16_to_cpu(x) __swab16(( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __be16_to_cpu(x) (( __u16) (__be16) (x)) #define __cpu_to_le64s(x) __swab64s((x)) #define __le64_to_cpus(x) __swab64s((x)) #define __cpu_to_le32s(x) __swab32s((x)) diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/little_endian.h b/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/little_endian.h index a272d4d1..28155b5e 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/little_endian.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/byteorder/little_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32) (x)) -#define __constant_htons(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __constant_le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __constant_le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __constant_le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) ___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) __swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) __swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) __swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) ___constant_swab32((x))) +#define __constant_ntohl(x) ___constant_swab32(( __be32) (x)) +#define __constant_htons(x) (( __be16) ___constant_swab16((x))) +#define __constant_ntohs(x) ___constant_swab16(( __be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __constant_le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __constant_le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __constant_le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) ___constant_swab64((x))) +#define __constant_be64_to_cpu(x) ___constant_swab64(( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) ___constant_swab32((x))) +#define __constant_be32_to_cpu(x) ___constant_swab32(( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) ___constant_swab16((x))) +#define __constant_be16_to_cpu(x) ___constant_swab16(( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) __swab64((x))) +#define __be64_to_cpu(x) __swab64(( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) __swab32((x))) +#define __be32_to_cpu(x) __swab32(( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) __swab16((x))) +#define __be16_to_cpu(x) __swab16(( __u16) (__be16) (x)) #define __cpu_to_le64s(x) do { (void) (x); } while(0) #define __le64_to_cpus(x) do { (void) (x); } while(0) #define __cpu_to_le32s(x) do { (void) (x); } while(0) diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/capability.h b/sysroots/aarch64-unknown-linux-musl/include/linux/capability.h index c1b5dbff..8f3281ed 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/capability.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/capability.h @@ -28,12 +28,12 @@ typedef struct __user_cap_header_struct { __u32 version; int pid; -} __user * cap_user_header_t; +} * cap_user_header_t; typedef struct __user_cap_data_struct { __u32 effective; __u32 permitted; __u32 inheritable; -} __user * cap_user_data_t; +} * cap_user_data_t; #define VFS_CAP_REVISION_MASK 0xFF000000 #define VFS_CAP_REVISION_SHIFT 24 #define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/capi.h b/sysroots/aarch64-unknown-linux-musl/include/linux/capi.h index de2a8390..a09f9bc7 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/capi.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/capi.h @@ -51,7 +51,7 @@ typedef struct capi_profile { #define CAPI_GET_PROFILE _IOWR('C', 0x09, struct capi_profile) typedef struct capi_manufacturer_cmd { unsigned long cmd; - void __user * data; + void * data; } capi_manufacturer_cmd; #define CAPI_MANUFACTURER_CMD _IOWR('C', 0x20, struct capi_manufacturer_cmd) #define CAPI_GET_ERRCODE _IOR('C', 0x21, __u16) diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/cciss_ioctl.h b/sysroots/aarch64-unknown-linux-musl/include/linux/cciss_ioctl.h index 3e9bb3b0..827e6a00 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/cciss_ioctl.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/cciss_ioctl.h @@ -47,7 +47,7 @@ typedef struct _IOCTL_Command_struct { RequestBlock_struct Request; ErrorInfo_struct error_info; WORD buf_size; - BYTE __user * buf; + BYTE * buf; } IOCTL_Command_struct; typedef struct _BIG_IOCTL_Command_struct { LUNAddr_struct LUN_info; @@ -55,7 +55,7 @@ typedef struct _BIG_IOCTL_Command_struct { ErrorInfo_struct error_info; DWORD malloc_size; DWORD buf_size; - BYTE __user * buf; + BYTE * buf; } BIG_IOCTL_Command_struct; typedef struct _LogvolInfo_struct { __u32 LunID; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/cdrom.h b/sysroots/aarch64-unknown-linux-musl/include/linux/cdrom.h index 0fe07275..bd1d7df9 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/cdrom.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/cdrom.h @@ -128,7 +128,7 @@ struct cdrom_read_audio { union cdrom_addr addr; __u8 addr_format; int nframes; - __u8 __user * buf; + __u8 * buf; }; struct cdrom_multisession { union cdrom_addr addr; @@ -149,16 +149,16 @@ struct cdrom_blk { #define CGC_DATA_NONE 3 struct cdrom_generic_command { unsigned char cmd[CDROM_PACKET_SIZE]; - unsigned char __user * buffer; + unsigned char * buffer; unsigned int buflen; int stat; - struct request_sense __user * sense; + struct request_sense * sense; unsigned char data_direction; int quiet; int timeout; union { - void __user * reserved[1]; - void __user * unused; + void * reserved[1]; + void * unused; }; }; struct cdrom_timed_media_change_info { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/chio.h b/sysroots/aarch64-unknown-linux-musl/include/linux/chio.h index 725e7608..74f286f9 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/chio.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/chio.h @@ -71,7 +71,7 @@ struct changer_position { #define CP_INVERT 1 struct changer_element_status { int ces_type; - unsigned char __user * ces_data; + unsigned char * ces_data; }; #define CESTATUS_FULL 0x01 #define CESTATUS_IMPEXP 0x02 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/coda.h b/sysroots/aarch64-unknown-linux-musl/include/linux/coda.h index aad1b97b..5795cdf1 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/coda.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/coda.h @@ -505,13 +505,13 @@ union coda_downcalls { }; #define PIOCPARM_MASK 0x0000ffff struct ViceIoctl { - void __user * in; - void __user * out; + void * in; + void * out; u_short in_size; u_short out_size; }; struct PioctlData { - const char __user * path; + const char * path; int follow; struct ViceIoctl vi; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/comedi.h b/sysroots/aarch64-unknown-linux-musl/include/linux/comedi.h index e0d015a3..465d1bfc 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/comedi.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/comedi.h @@ -244,14 +244,14 @@ enum comedi_counter_status_flags { struct comedi_insn { unsigned int insn; unsigned int n; - unsigned int __user * data; + unsigned int * data; unsigned int subdev; unsigned int chanspec; unsigned int unused[3]; }; struct comedi_insnlist { unsigned int n_insns; - struct comedi_insn __user * insns; + struct comedi_insn * insns; }; struct comedi_cmd { unsigned int subdev; @@ -268,19 +268,19 @@ struct comedi_cmd { unsigned int stop_arg; unsigned int * chanlist; unsigned int chanlist_len; - short __user * data; + short * data; unsigned int data_len; }; struct comedi_chaninfo { unsigned int subdev; - unsigned int __user * maxdata_list; - unsigned int __user * flaglist; - unsigned int __user * rangelist; + unsigned int * maxdata_list; + unsigned int * flaglist; + unsigned int * rangelist; unsigned int unused[4]; }; struct comedi_rangeinfo { unsigned int range_type; - void __user * range_ptr; + void * range_ptr; }; struct comedi_krange { int min; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/compiler.h b/sysroots/aarch64-unknown-linux-musl/include/linux/compiler.h index 8e89655c..42d59aa4 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/compiler.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/compiler.h @@ -1,18 +1,11 @@ -#ifndef _UAPI_LINUX_COMPILER_H -#define _UAPI_LINUX_COMPILER_H +#pragma once /* - * This file is not currently in the Linux kernel tree. - * Upstream uapi headers refer to <linux/compiler.h> but there is - * no such uapi file. We've sent this upstream, and are optimistically - * adding it to bionic in the meantime. This should be replaced by - * a scrubbed header from external/kernel-headers when possible. + * There is no `include/uapi/linux/compiler.h`, just `include/linux/compiler.h`. * - * An alternative to this file is to check in a symbolic link to the - * non-uapi <linux/compiler.h>. That's fine for building bionic too. + * We don't need anything _in_ this file, but we do need this file. + * The two #defines are for backwards compatibility. */ -#define __user #define __force - -#endif /* _UAPI_LINUX_COMPILER_H */ +#define __user diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/compiler_types.h b/sysroots/aarch64-unknown-linux-musl/include/linux/compiler_types.h index 94f4fbe5..859ae055 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/compiler_types.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/compiler_types.h @@ -1,5 +1,11 @@ +#pragma once + /* - * The compiler.h file has been split into compiler.h and compiler_types.h. - * However, to compile bionic we only need the compiler.h. + * There is no `include/uapi/linux/compiler_types.h`, just + * `include/linux/compiler_types.h`. + * + * We don't need anything _in_ this file, but we do need this file. + * The #include is for backwards compatibility. */ + #include <linux/compiler.h> diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/cxl_mem.h b/sysroots/aarch64-unknown-linux-musl/include/linux/cxl_mem.h index 578cefd2..c94af873 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/cxl_mem.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/cxl_mem.h @@ -44,7 +44,7 @@ struct cxl_command_info { struct cxl_mem_query_commands { __u32 n_commands; __u32 rsvd; - struct cxl_command_info __user commands[]; + struct cxl_command_info commands[]; }; struct cxl_send_command { __u32 id; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/dlm_device.h b/sysroots/aarch64-unknown-linux-musl/include/linux/dlm_device.h index 5e54d2e4..e1b0c6d7 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/dlm_device.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/dlm_device.h @@ -33,11 +33,11 @@ struct dlm_lock_params { __u32 parent; __u64 xid; __u64 timeout; - void __user * castparam; - void __user * castaddr; - void __user * bastparam; - void __user * bastaddr; - struct dlm_lksb __user * lksb; + void * castparam; + void * castaddr; + void * bastparam; + void * bastaddr; + struct dlm_lksb * lksb; char lvb[DLM_USER_LVB_LEN]; char name[]; }; @@ -67,9 +67,9 @@ struct dlm_device_version { struct dlm_lock_result { __u32 version[3]; __u32 length; - void __user * user_astaddr; - void __user * user_astparam; - struct dlm_lksb __user * user_lksb; + void * user_astaddr; + void * user_astparam; + struct dlm_lksb * user_lksb; struct dlm_lksb lksb; __u8 bast_mode; __u8 unused[3]; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/osd.h b/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/osd.h index 84b268b9..379294ed 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/osd.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/osd.h @@ -50,7 +50,7 @@ typedef struct osd_cmd_s { int x1; int y1; int color; - void __user * data; + void * data; } osd_cmd_t; typedef enum { OSD_BITMAP1, diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/video.h b/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/video.h index 6577e1ff..24587666 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/video.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/dvb/video.h @@ -94,7 +94,7 @@ struct video_status { video_displayformat_t display_format; }; struct video_still_picture { - char __user * iFrame; + char * iFrame; __s32 size; }; typedef __u16 video_attributes_t; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/eventpoll.h b/sysroots/aarch64-unknown-linux-musl/include/linux/eventpoll.h index 2a1a26a6..de4c1f1c 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/eventpoll.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/eventpoll.h @@ -25,23 +25,23 @@ #define EPOLL_CTL_ADD 1 #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 -#define EPOLLIN (__force __poll_t) 0x00000001 -#define EPOLLPRI (__force __poll_t) 0x00000002 -#define EPOLLOUT (__force __poll_t) 0x00000004 -#define EPOLLERR (__force __poll_t) 0x00000008 -#define EPOLLHUP (__force __poll_t) 0x00000010 -#define EPOLLNVAL (__force __poll_t) 0x00000020 -#define EPOLLRDNORM (__force __poll_t) 0x00000040 -#define EPOLLRDBAND (__force __poll_t) 0x00000080 -#define EPOLLWRNORM (__force __poll_t) 0x00000100 -#define EPOLLWRBAND (__force __poll_t) 0x00000200 -#define EPOLLMSG (__force __poll_t) 0x00000400 -#define EPOLLRDHUP (__force __poll_t) 0x00002000 -#define EPOLL_URING_WAKE ((__force __poll_t) (1U << 27)) -#define EPOLLEXCLUSIVE ((__force __poll_t) (1U << 28)) -#define EPOLLWAKEUP ((__force __poll_t) (1U << 29)) -#define EPOLLONESHOT ((__force __poll_t) (1U << 30)) -#define EPOLLET ((__force __poll_t) (1U << 31)) +#define EPOLLIN ( __poll_t) 0x00000001 +#define EPOLLPRI ( __poll_t) 0x00000002 +#define EPOLLOUT ( __poll_t) 0x00000004 +#define EPOLLERR ( __poll_t) 0x00000008 +#define EPOLLHUP ( __poll_t) 0x00000010 +#define EPOLLNVAL ( __poll_t) 0x00000020 +#define EPOLLRDNORM ( __poll_t) 0x00000040 +#define EPOLLRDBAND ( __poll_t) 0x00000080 +#define EPOLLWRNORM ( __poll_t) 0x00000100 +#define EPOLLWRBAND ( __poll_t) 0x00000200 +#define EPOLLMSG ( __poll_t) 0x00000400 +#define EPOLLRDHUP ( __poll_t) 0x00002000 +#define EPOLL_URING_WAKE (( __poll_t) (1U << 27)) +#define EPOLLEXCLUSIVE (( __poll_t) (1U << 28)) +#define EPOLLWAKEUP (( __poll_t) (1U << 29)) +#define EPOLLONESHOT (( __poll_t) (1U << 30)) +#define EPOLLET (( __poll_t) (1U << 31)) #ifdef __x86_64__ #define EPOLL_PACKED __attribute__((packed)) #else diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/fd.h b/sysroots/aarch64-unknown-linux-musl/include/linux/fd.h index 4d72d695..dc1d4446 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/fd.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/fd.h @@ -175,7 +175,7 @@ struct floppy_raw_cmd { #define FD_RAW_SOFTFAILURE 0x800 #define FD_RAW_FAILURE 0x10000 #define FD_RAW_HARDFAILURE 0x20000 - void __user * data; + void * data; char * kernel_data; struct floppy_raw_cmd * next; long length; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/filter.h b/sysroots/aarch64-unknown-linux-musl/include/linux/filter.h index d13c59d3..57fe2fbe 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/filter.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/filter.h @@ -31,7 +31,7 @@ struct sock_filter { }; struct sock_fprog { unsigned short len; - struct sock_filter __user * filter; + struct sock_filter * filter; }; #define BPF_RVAL(code) ((code) & 0x18) #define BPF_A 0x10 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/fs.h b/sysroots/aarch64-unknown-linux-musl/include/linux/fs.h index 96f91812..b8bfaacf 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/fs.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/fs.h @@ -190,10 +190,10 @@ struct fsxattr { #define SYNC_FILE_RANGE_WAIT_AFTER 4 #define SYNC_FILE_RANGE_WRITE_AND_WAIT (SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WAIT_AFTER) typedef int __bitwise __kernel_rwf_t; -#define RWF_HIPRI ((__force __kernel_rwf_t) 0x00000001) -#define RWF_DSYNC ((__force __kernel_rwf_t) 0x00000002) -#define RWF_SYNC ((__force __kernel_rwf_t) 0x00000004) -#define RWF_NOWAIT ((__force __kernel_rwf_t) 0x00000008) -#define RWF_APPEND ((__force __kernel_rwf_t) 0x00000010) +#define RWF_HIPRI (( __kernel_rwf_t) 0x00000001) +#define RWF_DSYNC (( __kernel_rwf_t) 0x00000002) +#define RWF_SYNC (( __kernel_rwf_t) 0x00000004) +#define RWF_NOWAIT (( __kernel_rwf_t) 0x00000008) +#define RWF_APPEND (( __kernel_rwf_t) 0x00000010) #define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND) #endif diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/futex.h b/sysroots/aarch64-unknown-linux-musl/include/linux/futex.h index c80b90c5..8d1a2a45 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/futex.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/futex.h @@ -59,12 +59,12 @@ struct futex_waitv { __u32 __reserved; }; struct robust_list { - struct robust_list __user * next; + struct robust_list * next; }; struct robust_list_head { struct robust_list list; long futex_offset; - struct robust_list __user * list_op_pending; + struct robust_list * list_op_pending; }; #define FUTEX_WAITERS 0x80000000 #define FUTEX_OWNER_DIED 0x40000000 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/i2c-dev.h b/sysroots/aarch64-unknown-linux-musl/include/linux/i2c-dev.h index 07fdda2b..7a25e20e 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/i2c-dev.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/i2c-dev.h @@ -33,10 +33,10 @@ struct i2c_smbus_ioctl_data { __u8 read_write; __u8 command; __u32 size; - union i2c_smbus_data __user * data; + union i2c_smbus_data * data; }; struct i2c_rdwr_ioctl_data { - struct i2c_msg __user * msgs; + struct i2c_msg * msgs; __u32 nmsgs; }; #define I2C_RDWR_IOCTL_MAX_MSGS 42 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/i2o-dev.h b/sysroots/aarch64-unknown-linux-musl/include/linux/i2o-dev.h index fc8b26d0..afaae74c 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/i2o-dev.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/i2o-dev.h @@ -42,38 +42,38 @@ struct i2o_cmd_passthru32 { }; struct i2o_cmd_passthru { unsigned int iop; - void __user * msg; + void * msg; }; struct i2o_cmd_hrtlct { unsigned int iop; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_cmd_psetget { unsigned int iop; unsigned int tid; - void __user * opbuf; + void * opbuf; unsigned int oplen; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_sw_xfer { unsigned int iop; unsigned char flags; unsigned char sw_type; unsigned int sw_id; - void __user * buf; - unsigned int __user * swlen; - unsigned int __user * maxfrag; - unsigned int __user * curfrag; + void * buf; + unsigned int * swlen; + unsigned int * maxfrag; + unsigned int * curfrag; }; struct i2o_html { unsigned int iop; unsigned int tid; unsigned int page; - void __user * resbuf; - unsigned int __user * reslen; - void __user * qbuf; + void * resbuf; + unsigned int * reslen; + void * qbuf; unsigned int qlen; }; #define I2O_EVT_Q_LEN 32 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/if.h b/sysroots/aarch64-unknown-linux-musl/include/linux/if.h index 63c77ebd..fc6d20d7 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/if.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/if.h @@ -130,14 +130,14 @@ struct if_settings { unsigned int type; unsigned int size; union { - raw_hdlc_proto __user * raw_hdlc; - cisco_proto __user * cisco; - fr_proto __user * fr; - fr_proto_pvc __user * fr_pvc; - fr_proto_pvc_info __user * fr_pvc_info; - x25_hdlc_proto __user * x25; - sync_serial_settings __user * sync; - te1_settings __user * te1; + raw_hdlc_proto * raw_hdlc; + cisco_proto * cisco; + fr_proto * fr; + fr_proto_pvc * fr_pvc; + fr_proto_pvc_info * fr_pvc_info; + x25_hdlc_proto * x25; + sync_serial_settings * sync; + te1_settings * te1; } ifs_ifsu; }; #if __UAPI_DEF_IF_IFREQ @@ -158,7 +158,7 @@ struct ifreq { struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; char ifru_newname[IFNAMSIZ]; - void __user * ifru_data; + void * ifru_data; struct if_settings ifru_settings; } ifr_ifru; }; @@ -184,8 +184,8 @@ struct ifreq { struct ifconf { int ifc_len; union { - char __user * ifcu_buf; - struct ifreq __user * ifcu_req; + char * ifcu_buf; + struct ifreq * ifcu_req; } ifc_ifcu; }; #endif diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/if_tunnel.h b/sysroots/aarch64-unknown-linux-musl/include/linux/if_tunnel.h index 01c2dc93..9b85568e 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/if_tunnel.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/if_tunnel.h @@ -142,7 +142,7 @@ enum { __IFLA_GRE_MAX, }; #define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) -#define VTI_ISVTI ((__force __be16) 0x0001) +#define VTI_ISVTI (( __be16) 0x0001) enum { IFLA_VTI_UNSPEC, IFLA_VTI_LINK, diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/input.h b/sysroots/aarch64-unknown-linux-musl/include/linux/input.h index 4858c817..1df1398f 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/input.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/input.h @@ -173,7 +173,7 @@ struct ff_periodic_effect { __u16 phase; struct ff_envelope envelope; __u32 custom_len; - __s16 __user * custom_data; + __s16 * custom_data; }; struct ff_rumble_effect { __u16 strong_magnitude; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/ipc.h b/sysroots/aarch64-unknown-linux-musl/include/linux/ipc.h index a0699cf3..4ca9ee15 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/ipc.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/ipc.h @@ -42,7 +42,7 @@ struct __kernel_legacy_ipc_perm { #define IPC_OLD 0 #define IPC_64 0x0100 struct ipc_kludge { - struct msgbuf __user * msgp; + struct msgbuf * msgp; long msgtyp; }; #define SEMOP 1 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/ipmi.h b/sysroots/aarch64-unknown-linux-musl/include/linux/ipmi.h index dd88f2f7..bd73b3c3 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/ipmi.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/ipmi.h @@ -65,7 +65,7 @@ struct ipmi_msg { unsigned char netfn; unsigned char cmd; unsigned short data_len; - unsigned char __user * data; + unsigned char * data; }; struct kernel_ipmi_msg { unsigned char netfn; @@ -86,7 +86,7 @@ struct kernel_ipmi_msg { #define IPMI_MAINTENANCE_MODE_ON 2 #define IPMI_IOC_MAGIC 'i' struct ipmi_req { - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; @@ -100,7 +100,7 @@ struct ipmi_req_settime { #define IPMICTL_SEND_COMMAND_SETTIME _IOR(IPMI_IOC_MAGIC, 21, struct ipmi_req_settime) struct ipmi_recv { int recv_type; - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/ivtv.h b/sysroots/aarch64-unknown-linux-musl/include/linux/ivtv.h index 549d6a89..bdd526ed 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/ivtv.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/ivtv.h @@ -24,8 +24,8 @@ struct ivtv_dma_frame { enum v4l2_buf_type type; __u32 pixelformat; - void __user * y_source; - void __user * uv_source; + void * y_source; + void * uv_source; struct v4l2_rect src; struct v4l2_rect dst; __u32 src_width; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/ivtvfb.h b/sysroots/aarch64-unknown-linux-musl/include/linux/ivtvfb.h index 9addcbf9..171be74d 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/ivtvfb.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/ivtvfb.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct ivtvfb_dma_frame { - void __user * source; + void * source; unsigned long dest_offset; int count; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/kd.h b/sysroots/aarch64-unknown-linux-musl/include/linux/kd.h index 2385037f..903681b7 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/kd.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/kd.h @@ -27,7 +27,7 @@ struct consolefontdesc { unsigned short charcount; unsigned short charheight; - char __user * chardata; + char * chardata; }; #define PIO_FONTRESET 0x4B6D #define GIO_CMAP 0x4B70 @@ -68,7 +68,7 @@ struct unipair { }; struct unimapdesc { unsigned short entry_ct; - struct unipair __user * entries; + struct unipair * entries; }; #define PIO_UNIMAP 0x4B67 #define PIO_UNIMAPCLR 0x4B68 @@ -147,7 +147,7 @@ struct console_font_op { unsigned int flags; unsigned int width, height; unsigned int charcount; - unsigned char __user * data; + unsigned char * data; }; struct console_font { unsigned int width, height; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/keyctl.h b/sysroots/aarch64-unknown-linux-musl/include/linux/keyctl.h index 01ea576d..b534f5eb 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/keyctl.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/keyctl.h @@ -80,8 +80,8 @@ struct keyctl_dh_params { __s32 base; }; struct keyctl_kdf_params { - char __user * hashname; - char __user * otherinfo; + char * hashname; + char * otherinfo; __u32 otherinfolen; __u32 __spare[8]; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/kvm.h b/sysroots/aarch64-unknown-linux-musl/include/linux/kvm.h index 9566f01d..9d33399f 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/kvm.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/kvm.h @@ -457,7 +457,7 @@ struct kvm_dirty_log { __u32 slot; __u32 padding1; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; @@ -466,7 +466,7 @@ struct kvm_clear_dirty_log { __u32 num_pages; __u64 first_page; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/media.h b/sysroots/aarch64-unknown-linux-musl/include/linux/media.h index 869d47b4..fe97e90f 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/media.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/media.h @@ -125,8 +125,8 @@ struct media_link_desc { }; struct media_links_enum { __u32 entity; - struct media_pad_desc __user * pads; - struct media_link_desc __user * links; + struct media_pad_desc * pads; + struct media_link_desc * links; __u32 reserved[4]; }; #define MEDIA_INTF_T_DVB_BASE 0x00000100 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h index 862f514f..b1fb5377 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h @@ -98,7 +98,7 @@ struct arpt_replace { unsigned int hook_entry[NF_ARP_NUMHOOKS]; unsigned int underflow[NF_ARP_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct arpt_entry entries[]; }; struct arpt_get_entries { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h index 7c8f435c..d87d65e6 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h @@ -42,10 +42,10 @@ struct ebt_replace { unsigned int valid_hooks; unsigned int nentries; unsigned int entries_size; - struct ebt_entries __user * hook_entry[NF_BR_NUMHOOKS]; + struct ebt_entries * hook_entry[NF_BR_NUMHOOKS]; unsigned int num_counters; - struct ebt_counter __user * counters; - char __user * entries; + struct ebt_counter * counters; + char * entries; }; struct ebt_replace_kernel { char name[EBT_TABLE_MAXNAMELEN]; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h index 14a65adc..5179be40 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h @@ -112,7 +112,7 @@ struct ipt_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ipt_entry entries[]; }; struct ipt_get_entries { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h index 22071db8..8c4ec88a 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h @@ -132,7 +132,7 @@ struct ip6t_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ip6t_entry entries[]; }; struct ip6t_get_entries { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/nfs4_mount.h b/sysroots/aarch64-unknown-linux-musl/include/linux/nfs4_mount.h index 0f794dd0..9b9c9f8a 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/nfs4_mount.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/nfs4_mount.h @@ -21,7 +21,7 @@ #define NFS4_MOUNT_VERSION 1 struct nfs_string { unsigned int len; - const char __user * data; + const char * data; }; struct nfs4_mount_data { int version; @@ -38,10 +38,10 @@ struct nfs4_mount_data { struct nfs_string mnt_path; struct nfs_string hostname; unsigned int host_addrlen; - struct sockaddr __user * host_addr; + struct sockaddr * host_addr; int proto; int auth_flavourlen; - int __user * auth_flavours; + int * auth_flavours; }; #define NFS4_MOUNT_SOFT 0x0001 #define NFS4_MOUNT_INTR 0x0002 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/omap3isp.h b/sysroots/aarch64-unknown-linux-musl/include/linux/omap3isp.h index 53345e3f..18346587 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/omap3isp.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/omap3isp.h @@ -88,7 +88,7 @@ struct omap3isp_h3a_aewb_config { }; struct omap3isp_stat_data { struct timeval ts; - void __user * buf; + void * buf; __struct_group(, frame,, __u32 buf_size; __u16 frame_number; __u16 cur_frame; @@ -224,12 +224,12 @@ struct omap3isp_ccdc_update_config { __u16 update; __u16 flag; enum omap3isp_alaw_ipwidth alawip; - struct omap3isp_ccdc_bclamp __user * bclamp; - struct omap3isp_ccdc_blcomp __user * blcomp; - struct omap3isp_ccdc_fpc __user * fpc; - struct omap3isp_ccdc_lsc_config __user * lsc_cfg; - struct omap3isp_ccdc_culling __user * cull; - __u8 __user * lsc; + struct omap3isp_ccdc_bclamp * bclamp; + struct omap3isp_ccdc_blcomp * blcomp; + struct omap3isp_ccdc_fpc * fpc; + struct omap3isp_ccdc_lsc_config * lsc_cfg; + struct omap3isp_ccdc_culling * cull; + __u8 * lsc; }; #define OMAP3ISP_PREV_LUMAENH (1 << 0) #define OMAP3ISP_PREV_INVALAW (1 << 1) @@ -323,17 +323,17 @@ struct omap3isp_prev_update_config { __u32 update; __u32 flag; __u32 shading_shift; - struct omap3isp_prev_luma __user * luma; - struct omap3isp_prev_hmed __user * hmed; - struct omap3isp_prev_cfa __user * cfa; - struct omap3isp_prev_csup __user * csup; - struct omap3isp_prev_wbal __user * wbal; - struct omap3isp_prev_blkadj __user * blkadj; - struct omap3isp_prev_rgbtorgb __user * rgb2rgb; - struct omap3isp_prev_csc __user * csc; - struct omap3isp_prev_yclimit __user * yclimit; - struct omap3isp_prev_dcor __user * dcor; - struct omap3isp_prev_nf __user * nf; - struct omap3isp_prev_gtables __user * gamma; + struct omap3isp_prev_luma * luma; + struct omap3isp_prev_hmed * hmed; + struct omap3isp_prev_cfa * cfa; + struct omap3isp_prev_csup * csup; + struct omap3isp_prev_wbal * wbal; + struct omap3isp_prev_blkadj * blkadj; + struct omap3isp_prev_rgbtorgb * rgb2rgb; + struct omap3isp_prev_csc * csc; + struct omap3isp_prev_yclimit * yclimit; + struct omap3isp_prev_dcor * dcor; + struct omap3isp_prev_nf * nf; + struct omap3isp_prev_gtables * gamma; }; #endif diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/omapfb.h b/sysroots/aarch64-unknown-linux-musl/include/linux/omapfb.h index 6ebec085..632e4689 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/omapfb.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/omapfb.h @@ -153,7 +153,7 @@ struct omapfb_memory_read { __u16 w; __u16 h; size_t buffer_size; - void __user * buffer; + void * buffer; }; struct omapfb_ovl_colormode { __u8 overlay_idx; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/ppp-ioctl.h b/sysroots/aarch64-unknown-linux-musl/include/linux/ppp-ioctl.h index 69c6e6d9..165d4477 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/ppp-ioctl.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/ppp-ioctl.h @@ -56,7 +56,7 @@ struct npioctl { enum NPmode mode; }; struct ppp_option_data { - __u8 __user * ptr; + __u8 * ptr; __u32 length; int transmit; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/route.h b/sysroots/aarch64-unknown-linux-musl/include/linux/route.h index 4ba6023d..f33327cc 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/route.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/route.h @@ -30,7 +30,7 @@ struct rtentry { unsigned long rt_pad3; void * rt_pad4; short rt_metric; - char __user * rt_dev; + char * rt_dev; unsigned long rt_mtu; #define rt_mss rt_mtu unsigned long rt_window; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/sem.h b/sysroots/aarch64-unknown-linux-musl/include/linux/sem.h index 98ed1bf3..c2f25e7d 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/sem.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/sem.h @@ -48,10 +48,10 @@ struct sembuf { }; union __kernel_legacy_semun { int val; - struct __kernel_legacy_semid_ds __user * buf; - unsigned short __user * array; - struct seminfo __user * __buf; - void __user * __pad; + struct __kernel_legacy_semid_ds * buf; + unsigned short * array; + struct seminfo * __buf; + void * __pad; }; struct seminfo { int semmap; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/sysctl.h b/sysroots/aarch64-unknown-linux-musl/include/linux/sysctl.h index ff17f7c5..5714323f 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/sysctl.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/sysctl.h @@ -23,11 +23,11 @@ #include <linux/compiler.h> #define CTL_MAXNAME 10 struct __sysctl_args { - int __user * name; + int * name; int nlen; - void __user * oldval; - size_t __user * oldlenp; - void __user * newval; + void * oldval; + size_t * oldlenp; + void * newval; size_t newlen; unsigned long __linux_unused[4]; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/time.h b/sysroots/aarch64-unknown-linux-musl/include/linux/time.h index df52295d..55d0e6e9 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/time.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/time.h @@ -18,14 +18,11 @@ ****************************************************************************/ #ifndef _UAPI_LINUX_TIME_H #define _UAPI_LINUX_TIME_H +#include <bits/timespec.h> #include <linux/types.h> #include <linux/time_types.h> #ifndef _STRUCT_TIMESPEC #define _STRUCT_TIMESPEC -struct timespec { - __kernel_old_time_t tv_sec; - long tv_nsec; -}; #endif struct timeval { __kernel_old_time_t tv_sec; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/uhid.h b/sysroots/aarch64-unknown-linux-musl/include/linux/uhid.h index 228ee503..1d471f84 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/uhid.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/uhid.h @@ -106,7 +106,7 @@ struct uhid_create_req { __u8 name[128]; __u8 phys[64]; __u8 uniq[64]; - __u8 __user * rd_data; + __u8 * rd_data; __u16 rd_size; __u16 bus; __u32 vendor; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/uio.h b/sysroots/aarch64-unknown-linux-musl/include/linux/uio.h index fa955cd0..04814c71 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/uio.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/uio.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct iovec { - void __user * iov_base; + void * iov_base; __kernel_size_t iov_len; }; #define UIO_FASTIOV 8 diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/usb/tmc.h b/sysroots/aarch64-unknown-linux-musl/include/linux/usb/tmc.h index 6d0add1e..b2672901 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/usb/tmc.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/usb/tmc.h @@ -46,7 +46,7 @@ struct usbtmc_request { } __attribute__((packed)); struct usbtmc_ctrlrequest { struct usbtmc_request req; - void __user * data; + void * data; } __attribute__((packed)); struct usbtmc_termchar { __u8 term_char; @@ -59,7 +59,7 @@ struct usbtmc_message { __u32 transfer_size; __u32 transferred; __u32 flags; - void __user * message; + void * message; } __attribute__((packed)); #define USBTMC_IOC_NR 91 #define USBTMC_IOCTL_INDICATOR_PULSE _IO(USBTMC_IOC_NR, 1) diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/usbdevice_fs.h b/sysroots/aarch64-unknown-linux-musl/include/linux/usbdevice_fs.h index 5fef522e..af8681b3 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/usbdevice_fs.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/usbdevice_fs.h @@ -27,13 +27,13 @@ struct usbdevfs_ctrltransfer { __u16 wIndex; __u16 wLength; __u32 timeout; - void __user * data; + void * data; }; struct usbdevfs_bulktransfer { unsigned int ep; unsigned int len; unsigned int timeout; - void __user * data; + void * data; }; struct usbdevfs_setinterface { unsigned int interface; @@ -41,7 +41,7 @@ struct usbdevfs_setinterface { }; struct usbdevfs_disconnectsignal { unsigned int signr; - void __user * context; + void * context; }; #define USBDEVFS_MAXDRIVERNAME 255 struct usbdevfs_getdriver { @@ -80,7 +80,7 @@ struct usbdevfs_urb { unsigned char endpoint; int status; unsigned int flags; - void __user * buffer; + void * buffer; int buffer_length; int actual_length; int start_frame; @@ -90,13 +90,13 @@ struct usbdevfs_urb { }; int error_count; unsigned int signr; - void __user * usercontext; + void * usercontext; struct usbdevfs_iso_packet_desc iso_frame_desc[]; }; struct usbdevfs_ioctl { int ifno; int ioctl_code; - void __user * data; + void * data; }; struct usbdevfs_hub_portinfo { char nports; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/uvcvideo.h b/sysroots/aarch64-unknown-linux-musl/include/linux/uvcvideo.h index 46528a93..f15ed784 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/uvcvideo.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/uvcvideo.h @@ -49,7 +49,7 @@ struct uvc_xu_control_mapping { __u8 offset; __u32 v4l2_type; __u32 data_type; - struct uvc_menu_info __user * menu_info; + struct uvc_menu_info * menu_info; __u32 menu_count; __u32 reserved[4]; }; @@ -58,7 +58,7 @@ struct uvc_xu_control_query { __u8 selector; __u8 query; __u16 size; - __u8 __user * data; + __u8 * data; }; #define UVCIOC_CTRL_MAP _IOWR('u', 0x20, struct uvc_xu_control_mapping) #define UVCIOC_CTRL_QUERY _IOWR('u', 0x21, struct uvc_xu_control_query) diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/vfio.h b/sysroots/aarch64-unknown-linux-musl/include/linux/vfio.h index 7dc3440f..3c1821c2 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/vfio.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/vfio.h @@ -390,7 +390,7 @@ struct vfio_iommu_type1_dma_map { struct vfio_bitmap { __u64 pgsize; __u64 size; - __u64 __user * data; + __u64 * data; }; struct vfio_iommu_type1_dma_unmap { __u32 argsz; diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/videodev2.h b/sysroots/aarch64-unknown-linux-musl/include/linux/videodev2.h index d418fd20..4fb0a254 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/videodev2.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/videodev2.h @@ -650,7 +650,7 @@ struct v4l2_framebuffer { #define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip __user * next; + struct v4l2_clip * next; }; struct v4l2_window { struct v4l2_rect w; @@ -658,7 +658,7 @@ struct v4l2_window { __u32 chromakey; struct v4l2_clip * clips; __u32 clipcount; - void __user * bitmap; + void * bitmap; __u8 global_alpha; }; struct v4l2_captureparm { @@ -895,32 +895,32 @@ struct v4l2_ext_control { union { __s32 value; __s64 value64; - char __user * string; - __u8 __user * p_u8; - __u16 __user * p_u16; - __u32 __user * p_u32; - __u32 __user * p_s32; - __u32 __user * p_s64; - struct v4l2_area __user * p_area; - struct v4l2_ctrl_h264_sps __user * p_h264_sps; + char * string; + __u8 * p_u8; + __u16 * p_u16; + __u32 * p_u32; + __u32 * p_s32; + __u32 * p_s64; + struct v4l2_area * p_area; + struct v4l2_ctrl_h264_sps * p_h264_sps; struct v4l2_ctrl_h264_pps * p_h264_pps; - struct v4l2_ctrl_h264_scaling_matrix __user * p_h264_scaling_matrix; - struct v4l2_ctrl_h264_pred_weights __user * p_h264_pred_weights; - struct v4l2_ctrl_h264_slice_params __user * p_h264_slice_params; - struct v4l2_ctrl_h264_decode_params __user * p_h264_decode_params; - struct v4l2_ctrl_fwht_params __user * p_fwht_params; - struct v4l2_ctrl_vp8_frame __user * p_vp8_frame; - struct v4l2_ctrl_mpeg2_sequence __user * p_mpeg2_sequence; - struct v4l2_ctrl_mpeg2_picture __user * p_mpeg2_picture; - struct v4l2_ctrl_mpeg2_quantisation __user * p_mpeg2_quantisation; - struct v4l2_ctrl_vp9_compressed_hdr __user * p_vp9_compressed_hdr_probs; - struct v4l2_ctrl_vp9_frame __user * p_vp9_frame; - struct v4l2_ctrl_hevc_sps __user * p_hevc_sps; - struct v4l2_ctrl_hevc_pps __user * p_hevc_pps; - struct v4l2_ctrl_hevc_slice_params __user * p_hevc_slice_params; - struct v4l2_ctrl_hevc_scaling_matrix __user * p_hevc_scaling_matrix; - struct v4l2_ctrl_hevc_decode_params __user * p_hevc_decode_params; - void __user * ptr; + struct v4l2_ctrl_h264_scaling_matrix * p_h264_scaling_matrix; + struct v4l2_ctrl_h264_pred_weights * p_h264_pred_weights; + struct v4l2_ctrl_h264_slice_params * p_h264_slice_params; + struct v4l2_ctrl_h264_decode_params * p_h264_decode_params; + struct v4l2_ctrl_fwht_params * p_fwht_params; + struct v4l2_ctrl_vp8_frame * p_vp8_frame; + struct v4l2_ctrl_mpeg2_sequence * p_mpeg2_sequence; + struct v4l2_ctrl_mpeg2_picture * p_mpeg2_picture; + struct v4l2_ctrl_mpeg2_quantisation * p_mpeg2_quantisation; + struct v4l2_ctrl_vp9_compressed_hdr * p_vp9_compressed_hdr_probs; + struct v4l2_ctrl_vp9_frame * p_vp9_frame; + struct v4l2_ctrl_hevc_sps * p_hevc_sps; + struct v4l2_ctrl_hevc_pps * p_hevc_pps; + struct v4l2_ctrl_hevc_slice_params * p_hevc_slice_params; + struct v4l2_ctrl_hevc_scaling_matrix * p_hevc_scaling_matrix; + struct v4l2_ctrl_hevc_decode_params * p_hevc_decode_params; + void * ptr; }; } __attribute__((packed)); struct v4l2_ext_controls { diff --git a/sysroots/aarch64-unknown-linux-musl/include/linux/wireless.h b/sysroots/aarch64-unknown-linux-musl/include/linux/wireless.h index ca31dd23..eb57fff1 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/linux/wireless.h +++ b/sysroots/aarch64-unknown-linux-musl/include/linux/wireless.h @@ -264,7 +264,7 @@ struct iw_param { __u16 flags; }; struct iw_point { - void __user * pointer; + void * pointer; __u16 length; __u16 flags; }; diff --git a/sysroots/aarch64-unknown-linux-musl/include/mtd/mtd-abi.h b/sysroots/aarch64-unknown-linux-musl/include/mtd/mtd-abi.h index 6e26cae8..aed2acc1 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/mtd/mtd-abi.h +++ b/sysroots/aarch64-unknown-linux-musl/include/mtd/mtd-abi.h @@ -30,7 +30,7 @@ struct erase_info_user64 { struct mtd_oob_buf { __u32 start; __u32 length; - unsigned char __user * ptr; + unsigned char * ptr; }; struct mtd_oob_buf64 { __u64 start; diff --git a/sysroots/aarch64-unknown-linux-musl/include/scsi/sg.h b/sysroots/aarch64-unknown-linux-musl/include/scsi/sg.h index 6911b163..9ba6cd64 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/scsi/sg.h +++ b/sysroots/aarch64-unknown-linux-musl/include/scsi/sg.h @@ -20,7 +20,7 @@ #define _SCSI_GENERIC_H #include <linux/compiler.h> typedef struct sg_iovec { - void __user * iov_base; + void * iov_base; size_t iov_len; } sg_iovec_t; typedef struct sg_io_hdr { @@ -30,13 +30,13 @@ typedef struct sg_io_hdr { unsigned char mx_sb_len; unsigned short iovec_count; unsigned int dxfer_len; - void __user * dxferp; - unsigned char __user * cmdp; - void __user * sbp; + void * dxferp; + unsigned char * cmdp; + void * sbp; unsigned int timeout; unsigned int flags; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned char status; unsigned char masked_status; unsigned char msg_status; @@ -96,7 +96,7 @@ typedef struct sg_req_info { char sg_io_owned; char problem; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned int duration; int unused; } sg_req_info_t; diff --git a/sysroots/aarch64-unknown-linux-musl/include/sound/asequencer.h b/sysroots/aarch64-unknown-linux-musl/include/sound/asequencer.h index 0076933a..01a50585 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/sound/asequencer.h +++ b/sysroots/aarch64-unknown-linux-musl/include/sound/asequencer.h @@ -209,9 +209,9 @@ struct snd_seq_running_info { #define SNDRV_SEQ_CLIENT_DUMMY 14 #define SNDRV_SEQ_CLIENT_OSS 15 typedef int __bitwise snd_seq_client_type_t; -#define NO_CLIENT ((__force snd_seq_client_type_t) 0) -#define USER_CLIENT ((__force snd_seq_client_type_t) 1) -#define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) +#define NO_CLIENT (( snd_seq_client_type_t) 0) +#define USER_CLIENT (( snd_seq_client_type_t) 1) +#define KERNEL_CLIENT (( snd_seq_client_type_t) 2) #define SNDRV_SEQ_FILTER_BROADCAST (1U << 0) #define SNDRV_SEQ_FILTER_MULTICAST (1U << 1) #define SNDRV_SEQ_FILTER_BOUNCE (1U << 2) diff --git a/sysroots/aarch64-unknown-linux-musl/include/sound/asound.h b/sysroots/aarch64-unknown-linux-musl/include/sound/asound.h index 6e325e90..9c1a3ae7 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/sound/asound.h +++ b/sysroots/aarch64-unknown-linux-musl/include/sound/asound.h @@ -96,7 +96,7 @@ struct snd_hwdep_dsp_status { struct snd_hwdep_dsp_image { unsigned int index; unsigned char name[64]; - unsigned char __user * image; + unsigned char * image; size_t length; unsigned long driver_data; }; @@ -125,64 +125,64 @@ enum { SNDRV_PCM_STREAM_LAST = SNDRV_PCM_STREAM_CAPTURE, }; typedef int __bitwise snd_pcm_access_t; -#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((__force snd_pcm_access_t) 0) -#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((__force snd_pcm_access_t) 1) -#define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((__force snd_pcm_access_t) 2) -#define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((__force snd_pcm_access_t) 3) -#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((__force snd_pcm_access_t) 4) +#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED (( snd_pcm_access_t) 0) +#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED (( snd_pcm_access_t) 1) +#define SNDRV_PCM_ACCESS_MMAP_COMPLEX (( snd_pcm_access_t) 2) +#define SNDRV_PCM_ACCESS_RW_INTERLEAVED (( snd_pcm_access_t) 3) +#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED (( snd_pcm_access_t) 4) #define SNDRV_PCM_ACCESS_LAST SNDRV_PCM_ACCESS_RW_NONINTERLEAVED typedef int __bitwise snd_pcm_format_t; -#define SNDRV_PCM_FORMAT_S8 ((__force snd_pcm_format_t) 0) -#define SNDRV_PCM_FORMAT_U8 ((__force snd_pcm_format_t) 1) -#define SNDRV_PCM_FORMAT_S16_LE ((__force snd_pcm_format_t) 2) -#define SNDRV_PCM_FORMAT_S16_BE ((__force snd_pcm_format_t) 3) -#define SNDRV_PCM_FORMAT_U16_LE ((__force snd_pcm_format_t) 4) -#define SNDRV_PCM_FORMAT_U16_BE ((__force snd_pcm_format_t) 5) -#define SNDRV_PCM_FORMAT_S24_LE ((__force snd_pcm_format_t) 6) -#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) -#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) -#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) -#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10) -#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11) -#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12) -#define SNDRV_PCM_FORMAT_U32_BE ((__force snd_pcm_format_t) 13) -#define SNDRV_PCM_FORMAT_FLOAT_LE ((__force snd_pcm_format_t) 14) -#define SNDRV_PCM_FORMAT_FLOAT_BE ((__force snd_pcm_format_t) 15) -#define SNDRV_PCM_FORMAT_FLOAT64_LE ((__force snd_pcm_format_t) 16) -#define SNDRV_PCM_FORMAT_FLOAT64_BE ((__force snd_pcm_format_t) 17) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((__force snd_pcm_format_t) 18) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((__force snd_pcm_format_t) 19) -#define SNDRV_PCM_FORMAT_MU_LAW ((__force snd_pcm_format_t) 20) -#define SNDRV_PCM_FORMAT_A_LAW ((__force snd_pcm_format_t) 21) -#define SNDRV_PCM_FORMAT_IMA_ADPCM ((__force snd_pcm_format_t) 22) -#define SNDRV_PCM_FORMAT_MPEG ((__force snd_pcm_format_t) 23) -#define SNDRV_PCM_FORMAT_GSM ((__force snd_pcm_format_t) 24) -#define SNDRV_PCM_FORMAT_S20_LE ((__force snd_pcm_format_t) 25) -#define SNDRV_PCM_FORMAT_S20_BE ((__force snd_pcm_format_t) 26) -#define SNDRV_PCM_FORMAT_U20_LE ((__force snd_pcm_format_t) 27) -#define SNDRV_PCM_FORMAT_U20_BE ((__force snd_pcm_format_t) 28) -#define SNDRV_PCM_FORMAT_SPECIAL ((__force snd_pcm_format_t) 31) -#define SNDRV_PCM_FORMAT_S24_3LE ((__force snd_pcm_format_t) 32) -#define SNDRV_PCM_FORMAT_S24_3BE ((__force snd_pcm_format_t) 33) -#define SNDRV_PCM_FORMAT_U24_3LE ((__force snd_pcm_format_t) 34) -#define SNDRV_PCM_FORMAT_U24_3BE ((__force snd_pcm_format_t) 35) -#define SNDRV_PCM_FORMAT_S20_3LE ((__force snd_pcm_format_t) 36) -#define SNDRV_PCM_FORMAT_S20_3BE ((__force snd_pcm_format_t) 37) -#define SNDRV_PCM_FORMAT_U20_3LE ((__force snd_pcm_format_t) 38) -#define SNDRV_PCM_FORMAT_U20_3BE ((__force snd_pcm_format_t) 39) -#define SNDRV_PCM_FORMAT_S18_3LE ((__force snd_pcm_format_t) 40) -#define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) -#define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) -#define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) -#define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) -#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) -#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) -#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) -#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) -#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) -#define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) -#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) -#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) +#define SNDRV_PCM_FORMAT_S8 (( snd_pcm_format_t) 0) +#define SNDRV_PCM_FORMAT_U8 (( snd_pcm_format_t) 1) +#define SNDRV_PCM_FORMAT_S16_LE (( snd_pcm_format_t) 2) +#define SNDRV_PCM_FORMAT_S16_BE (( snd_pcm_format_t) 3) +#define SNDRV_PCM_FORMAT_U16_LE (( snd_pcm_format_t) 4) +#define SNDRV_PCM_FORMAT_U16_BE (( snd_pcm_format_t) 5) +#define SNDRV_PCM_FORMAT_S24_LE (( snd_pcm_format_t) 6) +#define SNDRV_PCM_FORMAT_S24_BE (( snd_pcm_format_t) 7) +#define SNDRV_PCM_FORMAT_U24_LE (( snd_pcm_format_t) 8) +#define SNDRV_PCM_FORMAT_U24_BE (( snd_pcm_format_t) 9) +#define SNDRV_PCM_FORMAT_S32_LE (( snd_pcm_format_t) 10) +#define SNDRV_PCM_FORMAT_S32_BE (( snd_pcm_format_t) 11) +#define SNDRV_PCM_FORMAT_U32_LE (( snd_pcm_format_t) 12) +#define SNDRV_PCM_FORMAT_U32_BE (( snd_pcm_format_t) 13) +#define SNDRV_PCM_FORMAT_FLOAT_LE (( snd_pcm_format_t) 14) +#define SNDRV_PCM_FORMAT_FLOAT_BE (( snd_pcm_format_t) 15) +#define SNDRV_PCM_FORMAT_FLOAT64_LE (( snd_pcm_format_t) 16) +#define SNDRV_PCM_FORMAT_FLOAT64_BE (( snd_pcm_format_t) 17) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( snd_pcm_format_t) 18) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( snd_pcm_format_t) 19) +#define SNDRV_PCM_FORMAT_MU_LAW (( snd_pcm_format_t) 20) +#define SNDRV_PCM_FORMAT_A_LAW (( snd_pcm_format_t) 21) +#define SNDRV_PCM_FORMAT_IMA_ADPCM (( snd_pcm_format_t) 22) +#define SNDRV_PCM_FORMAT_MPEG (( snd_pcm_format_t) 23) +#define SNDRV_PCM_FORMAT_GSM (( snd_pcm_format_t) 24) +#define SNDRV_PCM_FORMAT_S20_LE (( snd_pcm_format_t) 25) +#define SNDRV_PCM_FORMAT_S20_BE (( snd_pcm_format_t) 26) +#define SNDRV_PCM_FORMAT_U20_LE (( snd_pcm_format_t) 27) +#define SNDRV_PCM_FORMAT_U20_BE (( snd_pcm_format_t) 28) +#define SNDRV_PCM_FORMAT_SPECIAL (( snd_pcm_format_t) 31) +#define SNDRV_PCM_FORMAT_S24_3LE (( snd_pcm_format_t) 32) +#define SNDRV_PCM_FORMAT_S24_3BE (( snd_pcm_format_t) 33) +#define SNDRV_PCM_FORMAT_U24_3LE (( snd_pcm_format_t) 34) +#define SNDRV_PCM_FORMAT_U24_3BE (( snd_pcm_format_t) 35) +#define SNDRV_PCM_FORMAT_S20_3LE (( snd_pcm_format_t) 36) +#define SNDRV_PCM_FORMAT_S20_3BE (( snd_pcm_format_t) 37) +#define SNDRV_PCM_FORMAT_U20_3LE (( snd_pcm_format_t) 38) +#define SNDRV_PCM_FORMAT_U20_3BE (( snd_pcm_format_t) 39) +#define SNDRV_PCM_FORMAT_S18_3LE (( snd_pcm_format_t) 40) +#define SNDRV_PCM_FORMAT_S18_3BE (( snd_pcm_format_t) 41) +#define SNDRV_PCM_FORMAT_U18_3LE (( snd_pcm_format_t) 42) +#define SNDRV_PCM_FORMAT_U18_3BE (( snd_pcm_format_t) 43) +#define SNDRV_PCM_FORMAT_G723_24 (( snd_pcm_format_t) 44) +#define SNDRV_PCM_FORMAT_G723_24_1B (( snd_pcm_format_t) 45) +#define SNDRV_PCM_FORMAT_G723_40 (( snd_pcm_format_t) 46) +#define SNDRV_PCM_FORMAT_G723_40_1B (( snd_pcm_format_t) 47) +#define SNDRV_PCM_FORMAT_DSD_U8 (( snd_pcm_format_t) 48) +#define SNDRV_PCM_FORMAT_DSD_U16_LE (( snd_pcm_format_t) 49) +#define SNDRV_PCM_FORMAT_DSD_U32_LE (( snd_pcm_format_t) 50) +#define SNDRV_PCM_FORMAT_DSD_U16_BE (( snd_pcm_format_t) 51) +#define SNDRV_PCM_FORMAT_DSD_U32_BE (( snd_pcm_format_t) 52) #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE #define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8 #ifdef SNDRV_LITTLE_ENDIAN @@ -212,7 +212,7 @@ typedef int __bitwise snd_pcm_format_t; #define SNDRV_PCM_FORMAT_U20 SNDRV_PCM_FORMAT_U20_BE #endif typedef int __bitwise snd_pcm_subformat_t; -#define SNDRV_PCM_SUBFORMAT_STD ((__force snd_pcm_subformat_t) 0) +#define SNDRV_PCM_SUBFORMAT_STD (( snd_pcm_subformat_t) 0) #define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD #define SNDRV_PCM_INFO_MMAP 0x00000001 #define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 @@ -243,15 +243,15 @@ typedef int __bitwise snd_pcm_subformat_t; #define __SND_STRUCT_TIME64 #endif typedef int __bitwise snd_pcm_state_t; -#define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) -#define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) -#define SNDRV_PCM_STATE_PREPARED ((__force snd_pcm_state_t) 2) -#define SNDRV_PCM_STATE_RUNNING ((__force snd_pcm_state_t) 3) -#define SNDRV_PCM_STATE_XRUN ((__force snd_pcm_state_t) 4) -#define SNDRV_PCM_STATE_DRAINING ((__force snd_pcm_state_t) 5) -#define SNDRV_PCM_STATE_PAUSED ((__force snd_pcm_state_t) 6) -#define SNDRV_PCM_STATE_SUSPENDED ((__force snd_pcm_state_t) 7) -#define SNDRV_PCM_STATE_DISCONNECTED ((__force snd_pcm_state_t) 8) +#define SNDRV_PCM_STATE_OPEN (( snd_pcm_state_t) 0) +#define SNDRV_PCM_STATE_SETUP (( snd_pcm_state_t) 1) +#define SNDRV_PCM_STATE_PREPARED (( snd_pcm_state_t) 2) +#define SNDRV_PCM_STATE_RUNNING (( snd_pcm_state_t) 3) +#define SNDRV_PCM_STATE_XRUN (( snd_pcm_state_t) 4) +#define SNDRV_PCM_STATE_DRAINING (( snd_pcm_state_t) 5) +#define SNDRV_PCM_STATE_PAUSED (( snd_pcm_state_t) 6) +#define SNDRV_PCM_STATE_SUSPENDED (( snd_pcm_state_t) 7) +#define SNDRV_PCM_STATE_DISCONNECTED (( snd_pcm_state_t) 8) #define SNDRV_PCM_STATE_LAST SNDRV_PCM_STATE_DISCONNECTED enum { SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000, @@ -475,12 +475,12 @@ struct __snd_pcm_sync_ptr64 { }; struct snd_xferi { snd_pcm_sframes_t result; - void __user * buf; + void * buf; snd_pcm_uframes_t frames; }; struct snd_xfern { snd_pcm_sframes_t result; - void __user * __user * bufs; + void * * bufs; snd_pcm_uframes_t frames; }; enum { @@ -776,22 +776,22 @@ struct snd_ctl_card_info { unsigned char components[128]; }; typedef int __bitwise snd_ctl_elem_type_t; -#define SNDRV_CTL_ELEM_TYPE_NONE ((__force snd_ctl_elem_type_t) 0) -#define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((__force snd_ctl_elem_type_t) 1) -#define SNDRV_CTL_ELEM_TYPE_INTEGER ((__force snd_ctl_elem_type_t) 2) -#define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((__force snd_ctl_elem_type_t) 3) -#define SNDRV_CTL_ELEM_TYPE_BYTES ((__force snd_ctl_elem_type_t) 4) -#define SNDRV_CTL_ELEM_TYPE_IEC958 ((__force snd_ctl_elem_type_t) 5) -#define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((__force snd_ctl_elem_type_t) 6) +#define SNDRV_CTL_ELEM_TYPE_NONE (( snd_ctl_elem_type_t) 0) +#define SNDRV_CTL_ELEM_TYPE_BOOLEAN (( snd_ctl_elem_type_t) 1) +#define SNDRV_CTL_ELEM_TYPE_INTEGER (( snd_ctl_elem_type_t) 2) +#define SNDRV_CTL_ELEM_TYPE_ENUMERATED (( snd_ctl_elem_type_t) 3) +#define SNDRV_CTL_ELEM_TYPE_BYTES (( snd_ctl_elem_type_t) 4) +#define SNDRV_CTL_ELEM_TYPE_IEC958 (( snd_ctl_elem_type_t) 5) +#define SNDRV_CTL_ELEM_TYPE_INTEGER64 (( snd_ctl_elem_type_t) 6) #define SNDRV_CTL_ELEM_TYPE_LAST SNDRV_CTL_ELEM_TYPE_INTEGER64 typedef int __bitwise snd_ctl_elem_iface_t; -#define SNDRV_CTL_ELEM_IFACE_CARD ((__force snd_ctl_elem_iface_t) 0) -#define SNDRV_CTL_ELEM_IFACE_HWDEP ((__force snd_ctl_elem_iface_t) 1) -#define SNDRV_CTL_ELEM_IFACE_MIXER ((__force snd_ctl_elem_iface_t) 2) -#define SNDRV_CTL_ELEM_IFACE_PCM ((__force snd_ctl_elem_iface_t) 3) -#define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((__force snd_ctl_elem_iface_t) 4) -#define SNDRV_CTL_ELEM_IFACE_TIMER ((__force snd_ctl_elem_iface_t) 5) -#define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((__force snd_ctl_elem_iface_t) 6) +#define SNDRV_CTL_ELEM_IFACE_CARD (( snd_ctl_elem_iface_t) 0) +#define SNDRV_CTL_ELEM_IFACE_HWDEP (( snd_ctl_elem_iface_t) 1) +#define SNDRV_CTL_ELEM_IFACE_MIXER (( snd_ctl_elem_iface_t) 2) +#define SNDRV_CTL_ELEM_IFACE_PCM (( snd_ctl_elem_iface_t) 3) +#define SNDRV_CTL_ELEM_IFACE_RAWMIDI (( snd_ctl_elem_iface_t) 4) +#define SNDRV_CTL_ELEM_IFACE_TIMER (( snd_ctl_elem_iface_t) 5) +#define SNDRV_CTL_ELEM_IFACE_SEQUENCER (( snd_ctl_elem_iface_t) 6) #define SNDRV_CTL_ELEM_IFACE_LAST SNDRV_CTL_ELEM_IFACE_SEQUENCER #define SNDRV_CTL_ELEM_ACCESS_READ (1 << 0) #define SNDRV_CTL_ELEM_ACCESS_WRITE (1 << 1) @@ -826,7 +826,7 @@ struct snd_ctl_elem_list { unsigned int space; unsigned int used; unsigned int count; - struct snd_ctl_elem_id __user * pids; + struct snd_ctl_elem_id * pids; unsigned char reserved[50]; }; struct snd_ctl_elem_info { diff --git a/sysroots/aarch64-unknown-linux-musl/include/xen/gntdev.h b/sysroots/aarch64-unknown-linux-musl/include/xen/gntdev.h index 1e78ac37..eada73c4 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/xen/gntdev.h +++ b/sysroots/aarch64-unknown-linux-musl/include/xen/gntdev.h @@ -55,7 +55,7 @@ struct ioctl_gntdev_unmap_notify { }; struct gntdev_grant_copy_segment { union { - void __user * virt; + void * virt; struct { grant_ref_t ref; __u16 offset; @@ -69,7 +69,7 @@ struct gntdev_grant_copy_segment { #define IOCTL_GNTDEV_GRANT_COPY _IOC(_IOC_NONE, 'G', 8, sizeof(struct ioctl_gntdev_grant_copy)) struct ioctl_gntdev_grant_copy { unsigned int count; - struct gntdev_grant_copy_segment __user * segments; + struct gntdev_grant_copy_segment * segments; }; #define UNMAP_NOTIFY_CLEAR_BYTE 0x1 #define UNMAP_NOTIFY_SEND_EVENT 0x2 diff --git a/sysroots/aarch64-unknown-linux-musl/include/xen/privcmd.h b/sysroots/aarch64-unknown-linux-musl/include/xen/privcmd.h index 145446b4..21d9f840 100644 --- a/sysroots/aarch64-unknown-linux-musl/include/xen/privcmd.h +++ b/sysroots/aarch64-unknown-linux-musl/include/xen/privcmd.h @@ -33,13 +33,13 @@ struct privcmd_mmap_entry { struct privcmd_mmap { int num; domid_t dom; - struct privcmd_mmap_entry __user * entry; + struct privcmd_mmap_entry * entry; }; struct privcmd_mmapbatch { int num; domid_t dom; __u64 addr; - xen_pfn_t __user * arr; + xen_pfn_t * arr; }; #define PRIVCMD_MMAPBATCH_MFN_ERROR 0xf0000000U #define PRIVCMD_MMAPBATCH_PAGED_ERROR 0x80000000U @@ -47,17 +47,17 @@ struct privcmd_mmapbatch_v2 { unsigned int num; domid_t dom; __u64 addr; - const xen_pfn_t __user * arr; - int __user * err; + const xen_pfn_t * arr; + int * err; }; struct privcmd_dm_op_buf { - void __user * uptr; + void * uptr; size_t size; }; struct privcmd_dm_op { domid_t dom; __u16 num; - const struct privcmd_dm_op_buf __user * ubufs; + const struct privcmd_dm_op_buf * ubufs; }; struct privcmd_mmap_resource { domid_t dom; diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crt1.o b/sysroots/aarch64-unknown-linux-musl/lib/crt1.o Binary files differindex 588bffb7..db528571 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/crt1.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crt1.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crtbegin.o b/sysroots/aarch64-unknown-linux-musl/lib/crtbegin.o Binary files differindex f670b8c8..699addea 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/crtbegin.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crtbegin.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crtbeginS.o b/sysroots/aarch64-unknown-linux-musl/lib/crtbeginS.o Binary files differindex f670b8c8..699addea 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/crtbeginS.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crtbeginS.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crtbeginT.o b/sysroots/aarch64-unknown-linux-musl/lib/crtbeginT.o Binary files differindex f670b8c8..699addea 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/crtbeginT.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crtbeginT.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crtend.o b/sysroots/aarch64-unknown-linux-musl/lib/crtend.o Binary files differindex 38926417..174f93a2 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/crtend.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crtend.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crtendS.o b/sysroots/aarch64-unknown-linux-musl/lib/crtendS.o Binary files differindex 38926417..174f93a2 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/crtendS.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crtendS.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crti.o b/sysroots/aarch64-unknown-linux-musl/lib/crti.o Binary files differindex 39d68980..3a36ca51 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/crti.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crti.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/crtn.o b/sysroots/aarch64-unknown-linux-musl/lib/crtn.o Binary files differindex 26078465..53c8ef16 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/crtn.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/crtn.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libc++.a b/sysroots/aarch64-unknown-linux-musl/lib/libc++.a Binary files differindex 8673e0e6..527a30da 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/libc++.a +++ b/sysroots/aarch64-unknown-linux-musl/lib/libc++.a diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libc++.so b/sysroots/aarch64-unknown-linux-musl/lib/libc++.so Binary files differindex c8d11d45..42f1efd8 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/libc++.so +++ b/sysroots/aarch64-unknown-linux-musl/lib/libc++.so diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libc++abi.a b/sysroots/aarch64-unknown-linux-musl/lib/libc++abi.a Binary files differindex 591a5816..db45a4ce 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/libc++abi.a +++ b/sysroots/aarch64-unknown-linux-musl/lib/libc++abi.a diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libc.a b/sysroots/aarch64-unknown-linux-musl/lib/libc.a Binary files differindex 3f8ac6c3..83cbdfaf 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/libc.a +++ b/sysroots/aarch64-unknown-linux-musl/lib/libc.a diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libc_musl.so b/sysroots/aarch64-unknown-linux-musl/lib/libc_musl.so Binary files differindex aaf4aa48..b453b3a5 100755 --- a/sysroots/aarch64-unknown-linux-musl/lib/libc_musl.so +++ b/sysroots/aarch64-unknown-linux-musl/lib/libc_musl.so diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libc_musl_linker_object.o b/sysroots/aarch64-unknown-linux-musl/lib/libc_musl_linker_object.o Binary files differindex 250f2e2d..27e8ebd3 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/libc_musl_linker_object.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/libc_musl_linker_object.o diff --git a/sysroots/aarch64-unknown-linux-musl/lib/libz.a b/sysroots/aarch64-unknown-linux-musl/lib/libz.a Binary files differindex f0cd67f6..3a66ff27 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/libz.a +++ b/sysroots/aarch64-unknown-linux-musl/lib/libz.a diff --git a/sysroots/aarch64-unknown-linux-musl/lib/rcrt1.o b/sysroots/aarch64-unknown-linux-musl/lib/rcrt1.o Binary files differindex 225756ea..9a991d6c 100644 --- a/sysroots/aarch64-unknown-linux-musl/lib/rcrt1.o +++ b/sysroots/aarch64-unknown-linux-musl/lib/rcrt1.o diff --git a/sysroots/arm-unknown-linux-musleabihf/NOTICE.bionic b/sysroots/arm-unknown-linux-musleabihf/NOTICE.bionic index 9d555923..4d3a1086 100644 --- a/sysroots/arm-unknown-linux-musleabihf/NOTICE.bionic +++ b/sysroots/arm-unknown-linux-musleabihf/NOTICE.bionic @@ -894,6 +894,34 @@ SUCH DAMAGE. ------------------------------------------------------------------- +Copyright (C) 2023 The Android Open Source Project +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +------------------------------------------------------------------- + Copyright (c) 1980, 1983, 1988, 1993 The Regents of the University of California. All rights reserved. diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-arm/asm/signal.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-arm/asm/signal.h index 04243808..90cb8d6a 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-arm/asm/signal.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-arm/asm/signal.h @@ -76,7 +76,7 @@ struct sigaction { #define sa_handler _u._sa_handler #define sa_sigaction _u._sa_sigaction typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-arm64/asm/kvm.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-arm64/asm/kvm.h index ecc2e011..ce0c3188 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-arm64/asm/kvm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-arm64/asm/kvm.h @@ -121,7 +121,7 @@ struct kvm_vcpu_events { struct kvm_arm_copy_mte_tags { __u64 guest_ipa; __u64 length; - void __user * addr; + void * addr; __u64 flags; __u64 reserved[2]; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/poll.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/poll.h index 372bc773..ba6f2e9e 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/poll.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/poll.h @@ -41,8 +41,8 @@ #ifndef POLLRDHUP #define POLLRDHUP 0x2000 #endif -#define POLLFREE (__force __poll_t) 0x4000 -#define POLL_BUSY_LOOP (__force __poll_t) 0x8000 +#define POLLFREE ( __poll_t) 0x4000 +#define POLL_BUSY_LOOP ( __poll_t) 0x8000 struct pollfd { int fd; short events; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/siginfo.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/siginfo.h index c5e4178b..90393bab 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/siginfo.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/siginfo.h @@ -22,7 +22,7 @@ #include <linux/types.h> typedef union sigval { int sival_int; - void __user * sival_ptr; + void * sival_ptr; } sigval_t; #define SI_MAX_SIZE 128 #ifndef __ARCH_SI_BAND_T @@ -58,7 +58,7 @@ union __sifields { __ARCH_SI_CLOCK_T _stime; } _sigchld; struct { - void __user * _addr; + void * _addr; #ifdef __ia64__ int _imm; unsigned int _flags; @@ -70,8 +70,8 @@ union __sifields { short _addr_lsb; struct { char _dummy_bnd[__ADDR_BND_PKEY_PAD]; - void __user * _lower; - void __user * _upper; + void * _lower; + void * _upper; } _addr_bnd; struct { char _dummy_pkey[__ADDR_BND_PKEY_PAD]; @@ -89,7 +89,7 @@ union __sifields { int _fd; } _sigpoll; struct { - void __user * _call_addr; + void * _call_addr; int _syscall; unsigned int _arch; } _sigsys; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal-defs.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal-defs.h index c7e95040..dea8fbca 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal-defs.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal-defs.h @@ -55,11 +55,11 @@ #endif #ifndef __ASSEMBLY__ typedef void __signalfn_t(int); -typedef __signalfn_t __user * __sighandler_t; +typedef __signalfn_t * __sighandler_t; typedef void __restorefn_t(void); -typedef __restorefn_t __user * __sigrestore_t; -#define SIG_DFL ((__force __sighandler_t) 0) -#define SIG_IGN ((__force __sighandler_t) 1) -#define SIG_ERR ((__force __sighandler_t) - 1) +typedef __restorefn_t * __sigrestore_t; +#define SIG_DFL (( __sighandler_t) 0) +#define SIG_IGN (( __sighandler_t) 1) +#define SIG_ERR (( __sighandler_t) - 1) #endif #endif diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal.h index 5cb1dce4..9cf393ff 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-generic/signal.h @@ -82,7 +82,7 @@ struct sigaction { sigset_t sa_mask; }; typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/sigcontext.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/sigcontext.h index 7d5b4d4d..c7909505 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/sigcontext.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/sigcontext.h @@ -180,7 +180,7 @@ struct sigcontext { __u32 eflags; __u32 esp_at_signal; __u16 ss, __ssh; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; __u32 oldmask; __u32 cr2; }; @@ -215,7 +215,7 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; #ifdef __ILP32__ __u32 __fpstate_pad; #endif diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/signal.h b/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/signal.h index cbeeac46..37dce50d 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/signal.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm-x86/asm/signal.h @@ -88,7 +88,7 @@ struct sigaction { }; #endif typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/asm/signal.h b/sysroots/arm-unknown-linux-musleabihf/include/asm/signal.h index 04243808..90cb8d6a 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/asm/signal.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/asm/signal.h @@ -76,7 +76,7 @@ struct sigaction { #define sa_handler _u._sa_handler #define sa_sigaction _u._sa_sigaction typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/drm.h index 878e899e..19544525 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/drm.h @@ -78,19 +78,19 @@ struct drm_version { int version_minor; int version_patchlevel; __kernel_size_t name_len; - char __user * name; + char * name; __kernel_size_t date_len; - char __user * date; + char * date; __kernel_size_t desc_len; - char __user * desc; + char * desc; }; struct drm_unique { __kernel_size_t unique_len; - char __user * unique; + char * unique; }; struct drm_list { int count; - struct drm_version __user * version; + struct drm_version * version; }; struct drm_block { int unused; @@ -202,37 +202,37 @@ struct drm_buf_desc { }; struct drm_buf_info { int count; - struct drm_buf_desc __user * list; + struct drm_buf_desc * list; }; struct drm_buf_free { int count; - int __user * list; + int * list; }; struct drm_buf_pub { int idx; int total; int used; - void __user * address; + void * address; }; struct drm_buf_map { int count; #ifdef __cplusplus - void __user * virt; + void * virt; #else - void __user * __linux_virtual; + void * __linux_virtual; #endif - struct drm_buf_pub __user * list; + struct drm_buf_pub * list; }; struct drm_dma { int context; int send_count; - int __user * send_indices; - int __user * send_sizes; + int * send_indices; + int * send_sizes; enum drm_dma_flags flags; int request_count; int request_size; - int __user * request_indices; - int __user * request_sizes; + int * request_indices; + int * request_sizes; int granted_count; }; enum drm_ctx_flags { @@ -245,7 +245,7 @@ struct drm_ctx { }; struct drm_ctx_res { int count; - struct drm_ctx __user * contexts; + struct drm_ctx * contexts; }; struct drm_draw { drm_drawable_t handle; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/i915_drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/i915_drm.h index a8982bf5..794e7849 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/i915_drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/i915_drm.h @@ -287,18 +287,18 @@ typedef struct drm_i915_batchbuffer { int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_batchbuffer_t; typedef struct _drm_i915_cmdbuffer { - char __user * buf; + char * buf; int sz; int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_cmdbuffer_t; typedef struct drm_i915_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_i915_irq_emit_t; typedef struct drm_i915_irq_wait { int irq_seq; @@ -371,7 +371,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_OA_TIMESTAMP_FREQUENCY 57 struct drm_i915_getparam { __s32 param; - int __user * value; + int * value; }; typedef struct drm_i915_getparam drm_i915_getparam_t; #define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1 @@ -387,7 +387,7 @@ typedef struct drm_i915_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_i915_mem_alloc_t; typedef struct drm_i915_mem_free { int region; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/mga_drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/mga_drm.h index dc62961d..eb55fa7c 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/mga_drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/mga_drm.h @@ -239,7 +239,7 @@ typedef struct _drm_mga_blit { #define MGA_PARAM_CARD_TYPE 2 typedef struct drm_mga_getparam { int param; - void __user * value; + void * value; } drm_mga_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/r128_drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/r128_drm.h index 618b6dca..3e013b17 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/r128_drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/r128_drm.h @@ -204,13 +204,13 @@ typedef struct drm_r128_depth { R128_READ_PIXELS = 0x04 } func; int n; - int __user * x; - int __user * y; - unsigned int __user * buffer; - unsigned char __user * mask; + int * x; + int * y; + unsigned int * buffer; + unsigned char * mask; } drm_r128_depth_t; typedef struct drm_r128_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_r128_stipple_t; typedef struct drm_r128_indirect { int idx; @@ -227,7 +227,7 @@ typedef struct drm_r128_fullscreen { #define R128_PARAM_IRQ_NR 1 typedef struct drm_r128_getparam { int param; - void __user * value; + void * value; } drm_r128_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/radeon_drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/radeon_drm.h index 9dc69ad5..3ec6bb3f 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/radeon_drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/radeon_drm.h @@ -479,7 +479,7 @@ typedef struct drm_radeon_clear { unsigned int clear_depth; unsigned int color_mask; unsigned int depth_mask; - drm_radeon_clear_rect_t __user * depth_boxes; + drm_radeon_clear_rect_t * depth_boxes; } drm_radeon_clear_t; typedef struct drm_radeon_vertex { int prim; @@ -498,20 +498,20 @@ typedef struct drm_radeon_vertex2 { int idx; int discard; int nr_states; - drm_radeon_state_t __user * state; + drm_radeon_state_t * state; int nr_prims; - drm_radeon_prim_t __user * prim; + drm_radeon_prim_t * prim; } drm_radeon_vertex2_t; typedef struct drm_radeon_cmd_buffer { int bufsz; - char __user * buf; + char * buf; int nbox; - struct drm_clip_rect __user * boxes; + struct drm_clip_rect * boxes; } drm_radeon_cmd_buffer_t; typedef struct drm_radeon_tex_image { unsigned int x, y; unsigned int width, height; - const void __user * data; + const void * data; } drm_radeon_tex_image_t; typedef struct drm_radeon_texture { unsigned int offset; @@ -519,10 +519,10 @@ typedef struct drm_radeon_texture { int format; int width; int height; - drm_radeon_tex_image_t __user * image; + drm_radeon_tex_image_t * image; } drm_radeon_texture_t; typedef struct drm_radeon_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_radeon_stipple_t; typedef struct drm_radeon_indirect { int idx; @@ -552,7 +552,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_NUM_Z_PIPES 17 typedef struct drm_radeon_getparam { int param; - void __user * value; + void * value; } drm_radeon_getparam_t; #define RADEON_MEM_REGION_GART 1 #define RADEON_MEM_REGION_FB 2 @@ -560,7 +560,7 @@ typedef struct drm_radeon_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_radeon_mem_alloc_t; typedef struct drm_radeon_mem_free { int region; @@ -572,7 +572,7 @@ typedef struct drm_radeon_mem_init_heap { int start; } drm_radeon_mem_init_heap_t; typedef struct drm_radeon_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_radeon_irq_emit_t; typedef struct drm_radeon_irq_wait { int irq_seq; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/savage_drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/savage_drm.h index ae87d21b..efc0ae6b 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/savage_drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/savage_drm.h @@ -68,14 +68,14 @@ typedef struct drm_savage_init { } drm_savage_init_t; typedef union drm_savage_cmd_header drm_savage_cmd_header_t; typedef struct drm_savage_cmdbuf { - drm_savage_cmd_header_t __user * cmd_addr; + drm_savage_cmd_header_t * cmd_addr; unsigned int size; unsigned int dma_idx; int discard; - unsigned int __user * vb_addr; + unsigned int * vb_addr; unsigned int vb_size; unsigned int vb_stride; - struct drm_clip_rect __user * box_addr; + struct drm_clip_rect * box_addr; unsigned int nbox; } drm_savage_cmdbuf_t; #define SAVAGE_WAIT_2D 0x1 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/drm/via_drm.h b/sysroots/arm-unknown-linux-musleabihf/include/drm/via_drm.h index 9ef645a1..95a149b6 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/drm/via_drm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/drm/via_drm.h @@ -125,7 +125,7 @@ typedef struct _drm_via_dma_init { unsigned long reg_pause_addr; } drm_via_dma_init_t; typedef struct _drm_via_cmdbuffer { - char __user * buf; + char * buf; unsigned long size; } drm_via_cmdbuffer_t; typedef struct _drm_via_tex_region { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/atm.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/atm.h index 488fa05a..72d329df 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/atm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/atm.h @@ -140,7 +140,7 @@ struct sockaddr_atmsvc { struct atmif_sioc { int number; int length; - void __user * arg; + void * arg; }; typedef unsigned short atm_backend_t; #endif diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/atmdev.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/atmdev.h index 69eb2400..74cdfc14 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/atmdev.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/atmdev.h @@ -86,7 +86,7 @@ struct atm_dev_stats { #define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG) struct atm_iobuf { int length; - void __user * buffer; + void * buffer; }; #define ATM_CI_MAX - 1 struct atm_cirange { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/blkpg.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/blkpg.h index fdde696e..bfe504ff 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/blkpg.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/blkpg.h @@ -25,7 +25,7 @@ struct blkpg_ioctl_arg { int op; int flags; int datalen; - void __user * data; + void * data; }; #define BLKPG_ADD_PARTITION 1 #define BLKPG_DEL_PARTITION 2 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/btrfs.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/btrfs.h index 80396255..0fdac660 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/btrfs.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/btrfs.h @@ -79,7 +79,7 @@ struct btrfs_ioctl_vol_args_v2 { union { struct { __u64 size; - struct btrfs_qgroup_inherit __user * qgroup_inherit; + struct btrfs_qgroup_inherit * qgroup_inherit; }; __u64 unused[4]; }; @@ -432,7 +432,7 @@ struct btrfs_ioctl_received_subvol_args { struct btrfs_ioctl_send_args { __s64 send_fd; __u64 clone_sources_count; - __u64 __user * clone_sources; + __u64 * clone_sources; __u64 parent_root; __u64 flags; __u32 version; @@ -469,7 +469,7 @@ struct btrfs_ioctl_get_subvol_rootref_args { __u8 align[7]; }; struct btrfs_ioctl_encoded_io_args { - const struct iovec __user * iov; + const struct iovec * iov; unsigned long iovcnt; __s64 offset; __u64 flags; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/big_endian.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/big_endian.h index b6c978b4..82c5a4cd 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/big_endian.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/big_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) (__u32) (x)) -#define __constant_ntohl(x) ((__force __u32) (__be32) (x)) -#define __constant_htons(x) ((__force __be16) (__u16) (x)) -#define __constant_ntohs(x) ((__force __u16) (__be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) ___constant_swab64((x))) -#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) ___constant_swab32((x))) -#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) ___constant_swab16((x))) -#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __constant_be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __constant_be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __constant_be16_to_cpu(x) ((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) __swab64((x))) -#define __le64_to_cpu(x) __swab64((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) __swab32((x))) -#define __le32_to_cpu(x) __swab32((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) __swab16((x))) -#define __le16_to_cpu(x) __swab16((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __be16_to_cpu(x) ((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) (__u32) (x)) +#define __constant_ntohl(x) (( __u32) (__be32) (x)) +#define __constant_htons(x) (( __be16) (__u16) (x)) +#define __constant_ntohs(x) (( __u16) (__be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) ___constant_swab64((x))) +#define __constant_le64_to_cpu(x) ___constant_swab64(( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) ___constant_swab32((x))) +#define __constant_le32_to_cpu(x) ___constant_swab32(( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) ___constant_swab16((x))) +#define __constant_le16_to_cpu(x) ___constant_swab16(( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __constant_be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __constant_be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __constant_be16_to_cpu(x) (( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) __swab64((x))) +#define __le64_to_cpu(x) __swab64(( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) __swab32((x))) +#define __le32_to_cpu(x) __swab32(( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) __swab16((x))) +#define __le16_to_cpu(x) __swab16(( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __be16_to_cpu(x) (( __u16) (__be16) (x)) #define __cpu_to_le64s(x) __swab64s((x)) #define __le64_to_cpus(x) __swab64s((x)) #define __cpu_to_le32s(x) __swab32s((x)) diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/little_endian.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/little_endian.h index a272d4d1..28155b5e 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/little_endian.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/byteorder/little_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32) (x)) -#define __constant_htons(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __constant_le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __constant_le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __constant_le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) ___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) __swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) __swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) __swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) ___constant_swab32((x))) +#define __constant_ntohl(x) ___constant_swab32(( __be32) (x)) +#define __constant_htons(x) (( __be16) ___constant_swab16((x))) +#define __constant_ntohs(x) ___constant_swab16(( __be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __constant_le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __constant_le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __constant_le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) ___constant_swab64((x))) +#define __constant_be64_to_cpu(x) ___constant_swab64(( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) ___constant_swab32((x))) +#define __constant_be32_to_cpu(x) ___constant_swab32(( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) ___constant_swab16((x))) +#define __constant_be16_to_cpu(x) ___constant_swab16(( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) __swab64((x))) +#define __be64_to_cpu(x) __swab64(( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) __swab32((x))) +#define __be32_to_cpu(x) __swab32(( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) __swab16((x))) +#define __be16_to_cpu(x) __swab16(( __u16) (__be16) (x)) #define __cpu_to_le64s(x) do { (void) (x); } while(0) #define __le64_to_cpus(x) do { (void) (x); } while(0) #define __cpu_to_le32s(x) do { (void) (x); } while(0) diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/capability.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/capability.h index c1b5dbff..8f3281ed 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/capability.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/capability.h @@ -28,12 +28,12 @@ typedef struct __user_cap_header_struct { __u32 version; int pid; -} __user * cap_user_header_t; +} * cap_user_header_t; typedef struct __user_cap_data_struct { __u32 effective; __u32 permitted; __u32 inheritable; -} __user * cap_user_data_t; +} * cap_user_data_t; #define VFS_CAP_REVISION_MASK 0xFF000000 #define VFS_CAP_REVISION_SHIFT 24 #define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/capi.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/capi.h index de2a8390..a09f9bc7 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/capi.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/capi.h @@ -51,7 +51,7 @@ typedef struct capi_profile { #define CAPI_GET_PROFILE _IOWR('C', 0x09, struct capi_profile) typedef struct capi_manufacturer_cmd { unsigned long cmd; - void __user * data; + void * data; } capi_manufacturer_cmd; #define CAPI_MANUFACTURER_CMD _IOWR('C', 0x20, struct capi_manufacturer_cmd) #define CAPI_GET_ERRCODE _IOR('C', 0x21, __u16) diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/cciss_ioctl.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/cciss_ioctl.h index 3e9bb3b0..827e6a00 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/cciss_ioctl.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/cciss_ioctl.h @@ -47,7 +47,7 @@ typedef struct _IOCTL_Command_struct { RequestBlock_struct Request; ErrorInfo_struct error_info; WORD buf_size; - BYTE __user * buf; + BYTE * buf; } IOCTL_Command_struct; typedef struct _BIG_IOCTL_Command_struct { LUNAddr_struct LUN_info; @@ -55,7 +55,7 @@ typedef struct _BIG_IOCTL_Command_struct { ErrorInfo_struct error_info; DWORD malloc_size; DWORD buf_size; - BYTE __user * buf; + BYTE * buf; } BIG_IOCTL_Command_struct; typedef struct _LogvolInfo_struct { __u32 LunID; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/cdrom.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/cdrom.h index 0fe07275..bd1d7df9 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/cdrom.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/cdrom.h @@ -128,7 +128,7 @@ struct cdrom_read_audio { union cdrom_addr addr; __u8 addr_format; int nframes; - __u8 __user * buf; + __u8 * buf; }; struct cdrom_multisession { union cdrom_addr addr; @@ -149,16 +149,16 @@ struct cdrom_blk { #define CGC_DATA_NONE 3 struct cdrom_generic_command { unsigned char cmd[CDROM_PACKET_SIZE]; - unsigned char __user * buffer; + unsigned char * buffer; unsigned int buflen; int stat; - struct request_sense __user * sense; + struct request_sense * sense; unsigned char data_direction; int quiet; int timeout; union { - void __user * reserved[1]; - void __user * unused; + void * reserved[1]; + void * unused; }; }; struct cdrom_timed_media_change_info { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/chio.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/chio.h index 725e7608..74f286f9 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/chio.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/chio.h @@ -71,7 +71,7 @@ struct changer_position { #define CP_INVERT 1 struct changer_element_status { int ces_type; - unsigned char __user * ces_data; + unsigned char * ces_data; }; #define CESTATUS_FULL 0x01 #define CESTATUS_IMPEXP 0x02 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/coda.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/coda.h index aad1b97b..5795cdf1 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/coda.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/coda.h @@ -505,13 +505,13 @@ union coda_downcalls { }; #define PIOCPARM_MASK 0x0000ffff struct ViceIoctl { - void __user * in; - void __user * out; + void * in; + void * out; u_short in_size; u_short out_size; }; struct PioctlData { - const char __user * path; + const char * path; int follow; struct ViceIoctl vi; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/comedi.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/comedi.h index e0d015a3..465d1bfc 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/comedi.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/comedi.h @@ -244,14 +244,14 @@ enum comedi_counter_status_flags { struct comedi_insn { unsigned int insn; unsigned int n; - unsigned int __user * data; + unsigned int * data; unsigned int subdev; unsigned int chanspec; unsigned int unused[3]; }; struct comedi_insnlist { unsigned int n_insns; - struct comedi_insn __user * insns; + struct comedi_insn * insns; }; struct comedi_cmd { unsigned int subdev; @@ -268,19 +268,19 @@ struct comedi_cmd { unsigned int stop_arg; unsigned int * chanlist; unsigned int chanlist_len; - short __user * data; + short * data; unsigned int data_len; }; struct comedi_chaninfo { unsigned int subdev; - unsigned int __user * maxdata_list; - unsigned int __user * flaglist; - unsigned int __user * rangelist; + unsigned int * maxdata_list; + unsigned int * flaglist; + unsigned int * rangelist; unsigned int unused[4]; }; struct comedi_rangeinfo { unsigned int range_type; - void __user * range_ptr; + void * range_ptr; }; struct comedi_krange { int min; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler.h index 8e89655c..42d59aa4 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler.h @@ -1,18 +1,11 @@ -#ifndef _UAPI_LINUX_COMPILER_H -#define _UAPI_LINUX_COMPILER_H +#pragma once /* - * This file is not currently in the Linux kernel tree. - * Upstream uapi headers refer to <linux/compiler.h> but there is - * no such uapi file. We've sent this upstream, and are optimistically - * adding it to bionic in the meantime. This should be replaced by - * a scrubbed header from external/kernel-headers when possible. + * There is no `include/uapi/linux/compiler.h`, just `include/linux/compiler.h`. * - * An alternative to this file is to check in a symbolic link to the - * non-uapi <linux/compiler.h>. That's fine for building bionic too. + * We don't need anything _in_ this file, but we do need this file. + * The two #defines are for backwards compatibility. */ -#define __user #define __force - -#endif /* _UAPI_LINUX_COMPILER_H */ +#define __user diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler_types.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler_types.h index 94f4fbe5..859ae055 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler_types.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/compiler_types.h @@ -1,5 +1,11 @@ +#pragma once + /* - * The compiler.h file has been split into compiler.h and compiler_types.h. - * However, to compile bionic we only need the compiler.h. + * There is no `include/uapi/linux/compiler_types.h`, just + * `include/linux/compiler_types.h`. + * + * We don't need anything _in_ this file, but we do need this file. + * The #include is for backwards compatibility. */ + #include <linux/compiler.h> diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/cxl_mem.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/cxl_mem.h index 578cefd2..c94af873 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/cxl_mem.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/cxl_mem.h @@ -44,7 +44,7 @@ struct cxl_command_info { struct cxl_mem_query_commands { __u32 n_commands; __u32 rsvd; - struct cxl_command_info __user commands[]; + struct cxl_command_info commands[]; }; struct cxl_send_command { __u32 id; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/dlm_device.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/dlm_device.h index 5e54d2e4..e1b0c6d7 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/dlm_device.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/dlm_device.h @@ -33,11 +33,11 @@ struct dlm_lock_params { __u32 parent; __u64 xid; __u64 timeout; - void __user * castparam; - void __user * castaddr; - void __user * bastparam; - void __user * bastaddr; - struct dlm_lksb __user * lksb; + void * castparam; + void * castaddr; + void * bastparam; + void * bastaddr; + struct dlm_lksb * lksb; char lvb[DLM_USER_LVB_LEN]; char name[]; }; @@ -67,9 +67,9 @@ struct dlm_device_version { struct dlm_lock_result { __u32 version[3]; __u32 length; - void __user * user_astaddr; - void __user * user_astparam; - struct dlm_lksb __user * user_lksb; + void * user_astaddr; + void * user_astparam; + struct dlm_lksb * user_lksb; struct dlm_lksb lksb; __u8 bast_mode; __u8 unused[3]; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/osd.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/osd.h index 84b268b9..379294ed 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/osd.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/osd.h @@ -50,7 +50,7 @@ typedef struct osd_cmd_s { int x1; int y1; int color; - void __user * data; + void * data; } osd_cmd_t; typedef enum { OSD_BITMAP1, diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/video.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/video.h index 6577e1ff..24587666 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/video.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/dvb/video.h @@ -94,7 +94,7 @@ struct video_status { video_displayformat_t display_format; }; struct video_still_picture { - char __user * iFrame; + char * iFrame; __s32 size; }; typedef __u16 video_attributes_t; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/eventpoll.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/eventpoll.h index 2a1a26a6..de4c1f1c 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/eventpoll.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/eventpoll.h @@ -25,23 +25,23 @@ #define EPOLL_CTL_ADD 1 #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 -#define EPOLLIN (__force __poll_t) 0x00000001 -#define EPOLLPRI (__force __poll_t) 0x00000002 -#define EPOLLOUT (__force __poll_t) 0x00000004 -#define EPOLLERR (__force __poll_t) 0x00000008 -#define EPOLLHUP (__force __poll_t) 0x00000010 -#define EPOLLNVAL (__force __poll_t) 0x00000020 -#define EPOLLRDNORM (__force __poll_t) 0x00000040 -#define EPOLLRDBAND (__force __poll_t) 0x00000080 -#define EPOLLWRNORM (__force __poll_t) 0x00000100 -#define EPOLLWRBAND (__force __poll_t) 0x00000200 -#define EPOLLMSG (__force __poll_t) 0x00000400 -#define EPOLLRDHUP (__force __poll_t) 0x00002000 -#define EPOLL_URING_WAKE ((__force __poll_t) (1U << 27)) -#define EPOLLEXCLUSIVE ((__force __poll_t) (1U << 28)) -#define EPOLLWAKEUP ((__force __poll_t) (1U << 29)) -#define EPOLLONESHOT ((__force __poll_t) (1U << 30)) -#define EPOLLET ((__force __poll_t) (1U << 31)) +#define EPOLLIN ( __poll_t) 0x00000001 +#define EPOLLPRI ( __poll_t) 0x00000002 +#define EPOLLOUT ( __poll_t) 0x00000004 +#define EPOLLERR ( __poll_t) 0x00000008 +#define EPOLLHUP ( __poll_t) 0x00000010 +#define EPOLLNVAL ( __poll_t) 0x00000020 +#define EPOLLRDNORM ( __poll_t) 0x00000040 +#define EPOLLRDBAND ( __poll_t) 0x00000080 +#define EPOLLWRNORM ( __poll_t) 0x00000100 +#define EPOLLWRBAND ( __poll_t) 0x00000200 +#define EPOLLMSG ( __poll_t) 0x00000400 +#define EPOLLRDHUP ( __poll_t) 0x00002000 +#define EPOLL_URING_WAKE (( __poll_t) (1U << 27)) +#define EPOLLEXCLUSIVE (( __poll_t) (1U << 28)) +#define EPOLLWAKEUP (( __poll_t) (1U << 29)) +#define EPOLLONESHOT (( __poll_t) (1U << 30)) +#define EPOLLET (( __poll_t) (1U << 31)) #ifdef __x86_64__ #define EPOLL_PACKED __attribute__((packed)) #else diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/fd.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/fd.h index 4d72d695..dc1d4446 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/fd.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/fd.h @@ -175,7 +175,7 @@ struct floppy_raw_cmd { #define FD_RAW_SOFTFAILURE 0x800 #define FD_RAW_FAILURE 0x10000 #define FD_RAW_HARDFAILURE 0x20000 - void __user * data; + void * data; char * kernel_data; struct floppy_raw_cmd * next; long length; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/filter.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/filter.h index d13c59d3..57fe2fbe 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/filter.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/filter.h @@ -31,7 +31,7 @@ struct sock_filter { }; struct sock_fprog { unsigned short len; - struct sock_filter __user * filter; + struct sock_filter * filter; }; #define BPF_RVAL(code) ((code) & 0x18) #define BPF_A 0x10 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/fs.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/fs.h index 96f91812..b8bfaacf 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/fs.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/fs.h @@ -190,10 +190,10 @@ struct fsxattr { #define SYNC_FILE_RANGE_WAIT_AFTER 4 #define SYNC_FILE_RANGE_WRITE_AND_WAIT (SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WAIT_AFTER) typedef int __bitwise __kernel_rwf_t; -#define RWF_HIPRI ((__force __kernel_rwf_t) 0x00000001) -#define RWF_DSYNC ((__force __kernel_rwf_t) 0x00000002) -#define RWF_SYNC ((__force __kernel_rwf_t) 0x00000004) -#define RWF_NOWAIT ((__force __kernel_rwf_t) 0x00000008) -#define RWF_APPEND ((__force __kernel_rwf_t) 0x00000010) +#define RWF_HIPRI (( __kernel_rwf_t) 0x00000001) +#define RWF_DSYNC (( __kernel_rwf_t) 0x00000002) +#define RWF_SYNC (( __kernel_rwf_t) 0x00000004) +#define RWF_NOWAIT (( __kernel_rwf_t) 0x00000008) +#define RWF_APPEND (( __kernel_rwf_t) 0x00000010) #define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND) #endif diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/futex.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/futex.h index c80b90c5..8d1a2a45 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/futex.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/futex.h @@ -59,12 +59,12 @@ struct futex_waitv { __u32 __reserved; }; struct robust_list { - struct robust_list __user * next; + struct robust_list * next; }; struct robust_list_head { struct robust_list list; long futex_offset; - struct robust_list __user * list_op_pending; + struct robust_list * list_op_pending; }; #define FUTEX_WAITERS 0x80000000 #define FUTEX_OWNER_DIED 0x40000000 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/i2c-dev.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/i2c-dev.h index 07fdda2b..7a25e20e 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/i2c-dev.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/i2c-dev.h @@ -33,10 +33,10 @@ struct i2c_smbus_ioctl_data { __u8 read_write; __u8 command; __u32 size; - union i2c_smbus_data __user * data; + union i2c_smbus_data * data; }; struct i2c_rdwr_ioctl_data { - struct i2c_msg __user * msgs; + struct i2c_msg * msgs; __u32 nmsgs; }; #define I2C_RDWR_IOCTL_MAX_MSGS 42 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/i2o-dev.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/i2o-dev.h index fc8b26d0..afaae74c 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/i2o-dev.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/i2o-dev.h @@ -42,38 +42,38 @@ struct i2o_cmd_passthru32 { }; struct i2o_cmd_passthru { unsigned int iop; - void __user * msg; + void * msg; }; struct i2o_cmd_hrtlct { unsigned int iop; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_cmd_psetget { unsigned int iop; unsigned int tid; - void __user * opbuf; + void * opbuf; unsigned int oplen; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_sw_xfer { unsigned int iop; unsigned char flags; unsigned char sw_type; unsigned int sw_id; - void __user * buf; - unsigned int __user * swlen; - unsigned int __user * maxfrag; - unsigned int __user * curfrag; + void * buf; + unsigned int * swlen; + unsigned int * maxfrag; + unsigned int * curfrag; }; struct i2o_html { unsigned int iop; unsigned int tid; unsigned int page; - void __user * resbuf; - unsigned int __user * reslen; - void __user * qbuf; + void * resbuf; + unsigned int * reslen; + void * qbuf; unsigned int qlen; }; #define I2O_EVT_Q_LEN 32 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/if.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/if.h index 63c77ebd..fc6d20d7 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/if.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/if.h @@ -130,14 +130,14 @@ struct if_settings { unsigned int type; unsigned int size; union { - raw_hdlc_proto __user * raw_hdlc; - cisco_proto __user * cisco; - fr_proto __user * fr; - fr_proto_pvc __user * fr_pvc; - fr_proto_pvc_info __user * fr_pvc_info; - x25_hdlc_proto __user * x25; - sync_serial_settings __user * sync; - te1_settings __user * te1; + raw_hdlc_proto * raw_hdlc; + cisco_proto * cisco; + fr_proto * fr; + fr_proto_pvc * fr_pvc; + fr_proto_pvc_info * fr_pvc_info; + x25_hdlc_proto * x25; + sync_serial_settings * sync; + te1_settings * te1; } ifs_ifsu; }; #if __UAPI_DEF_IF_IFREQ @@ -158,7 +158,7 @@ struct ifreq { struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; char ifru_newname[IFNAMSIZ]; - void __user * ifru_data; + void * ifru_data; struct if_settings ifru_settings; } ifr_ifru; }; @@ -184,8 +184,8 @@ struct ifreq { struct ifconf { int ifc_len; union { - char __user * ifcu_buf; - struct ifreq __user * ifcu_req; + char * ifcu_buf; + struct ifreq * ifcu_req; } ifc_ifcu; }; #endif diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/if_tunnel.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/if_tunnel.h index 01c2dc93..9b85568e 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/if_tunnel.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/if_tunnel.h @@ -142,7 +142,7 @@ enum { __IFLA_GRE_MAX, }; #define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) -#define VTI_ISVTI ((__force __be16) 0x0001) +#define VTI_ISVTI (( __be16) 0x0001) enum { IFLA_VTI_UNSPEC, IFLA_VTI_LINK, diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/input.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/input.h index 4858c817..1df1398f 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/input.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/input.h @@ -173,7 +173,7 @@ struct ff_periodic_effect { __u16 phase; struct ff_envelope envelope; __u32 custom_len; - __s16 __user * custom_data; + __s16 * custom_data; }; struct ff_rumble_effect { __u16 strong_magnitude; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/ipc.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/ipc.h index a0699cf3..4ca9ee15 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/ipc.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/ipc.h @@ -42,7 +42,7 @@ struct __kernel_legacy_ipc_perm { #define IPC_OLD 0 #define IPC_64 0x0100 struct ipc_kludge { - struct msgbuf __user * msgp; + struct msgbuf * msgp; long msgtyp; }; #define SEMOP 1 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/ipmi.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/ipmi.h index dd88f2f7..bd73b3c3 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/ipmi.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/ipmi.h @@ -65,7 +65,7 @@ struct ipmi_msg { unsigned char netfn; unsigned char cmd; unsigned short data_len; - unsigned char __user * data; + unsigned char * data; }; struct kernel_ipmi_msg { unsigned char netfn; @@ -86,7 +86,7 @@ struct kernel_ipmi_msg { #define IPMI_MAINTENANCE_MODE_ON 2 #define IPMI_IOC_MAGIC 'i' struct ipmi_req { - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; @@ -100,7 +100,7 @@ struct ipmi_req_settime { #define IPMICTL_SEND_COMMAND_SETTIME _IOR(IPMI_IOC_MAGIC, 21, struct ipmi_req_settime) struct ipmi_recv { int recv_type; - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtv.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtv.h index 549d6a89..bdd526ed 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtv.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtv.h @@ -24,8 +24,8 @@ struct ivtv_dma_frame { enum v4l2_buf_type type; __u32 pixelformat; - void __user * y_source; - void __user * uv_source; + void * y_source; + void * uv_source; struct v4l2_rect src; struct v4l2_rect dst; __u32 src_width; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtvfb.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtvfb.h index 9addcbf9..171be74d 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtvfb.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/ivtvfb.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct ivtvfb_dma_frame { - void __user * source; + void * source; unsigned long dest_offset; int count; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/kd.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/kd.h index 2385037f..903681b7 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/kd.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/kd.h @@ -27,7 +27,7 @@ struct consolefontdesc { unsigned short charcount; unsigned short charheight; - char __user * chardata; + char * chardata; }; #define PIO_FONTRESET 0x4B6D #define GIO_CMAP 0x4B70 @@ -68,7 +68,7 @@ struct unipair { }; struct unimapdesc { unsigned short entry_ct; - struct unipair __user * entries; + struct unipair * entries; }; #define PIO_UNIMAP 0x4B67 #define PIO_UNIMAPCLR 0x4B68 @@ -147,7 +147,7 @@ struct console_font_op { unsigned int flags; unsigned int width, height; unsigned int charcount; - unsigned char __user * data; + unsigned char * data; }; struct console_font { unsigned int width, height; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/keyctl.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/keyctl.h index 01ea576d..b534f5eb 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/keyctl.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/keyctl.h @@ -80,8 +80,8 @@ struct keyctl_dh_params { __s32 base; }; struct keyctl_kdf_params { - char __user * hashname; - char __user * otherinfo; + char * hashname; + char * otherinfo; __u32 otherinfolen; __u32 __spare[8]; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/kvm.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/kvm.h index 9566f01d..9d33399f 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/kvm.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/kvm.h @@ -457,7 +457,7 @@ struct kvm_dirty_log { __u32 slot; __u32 padding1; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; @@ -466,7 +466,7 @@ struct kvm_clear_dirty_log { __u32 num_pages; __u64 first_page; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/media.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/media.h index 869d47b4..fe97e90f 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/media.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/media.h @@ -125,8 +125,8 @@ struct media_link_desc { }; struct media_links_enum { __u32 entity; - struct media_pad_desc __user * pads; - struct media_link_desc __user * links; + struct media_pad_desc * pads; + struct media_link_desc * links; __u32 reserved[4]; }; #define MEDIA_INTF_T_DVB_BASE 0x00000100 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_arp/arp_tables.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_arp/arp_tables.h index 862f514f..b1fb5377 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_arp/arp_tables.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_arp/arp_tables.h @@ -98,7 +98,7 @@ struct arpt_replace { unsigned int hook_entry[NF_ARP_NUMHOOKS]; unsigned int underflow[NF_ARP_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct arpt_entry entries[]; }; struct arpt_get_entries { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_bridge/ebtables.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_bridge/ebtables.h index 7c8f435c..d87d65e6 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_bridge/ebtables.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_bridge/ebtables.h @@ -42,10 +42,10 @@ struct ebt_replace { unsigned int valid_hooks; unsigned int nentries; unsigned int entries_size; - struct ebt_entries __user * hook_entry[NF_BR_NUMHOOKS]; + struct ebt_entries * hook_entry[NF_BR_NUMHOOKS]; unsigned int num_counters; - struct ebt_counter __user * counters; - char __user * entries; + struct ebt_counter * counters; + char * entries; }; struct ebt_replace_kernel { char name[EBT_TABLE_MAXNAMELEN]; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv4/ip_tables.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv4/ip_tables.h index 14a65adc..5179be40 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv4/ip_tables.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv4/ip_tables.h @@ -112,7 +112,7 @@ struct ipt_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ipt_entry entries[]; }; struct ipt_get_entries { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv6/ip6_tables.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv6/ip6_tables.h index 22071db8..8c4ec88a 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv6/ip6_tables.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/netfilter_ipv6/ip6_tables.h @@ -132,7 +132,7 @@ struct ip6t_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ip6t_entry entries[]; }; struct ip6t_get_entries { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/nfs4_mount.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/nfs4_mount.h index 0f794dd0..9b9c9f8a 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/nfs4_mount.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/nfs4_mount.h @@ -21,7 +21,7 @@ #define NFS4_MOUNT_VERSION 1 struct nfs_string { unsigned int len; - const char __user * data; + const char * data; }; struct nfs4_mount_data { int version; @@ -38,10 +38,10 @@ struct nfs4_mount_data { struct nfs_string mnt_path; struct nfs_string hostname; unsigned int host_addrlen; - struct sockaddr __user * host_addr; + struct sockaddr * host_addr; int proto; int auth_flavourlen; - int __user * auth_flavours; + int * auth_flavours; }; #define NFS4_MOUNT_SOFT 0x0001 #define NFS4_MOUNT_INTR 0x0002 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/omap3isp.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/omap3isp.h index 53345e3f..18346587 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/omap3isp.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/omap3isp.h @@ -88,7 +88,7 @@ struct omap3isp_h3a_aewb_config { }; struct omap3isp_stat_data { struct timeval ts; - void __user * buf; + void * buf; __struct_group(, frame,, __u32 buf_size; __u16 frame_number; __u16 cur_frame; @@ -224,12 +224,12 @@ struct omap3isp_ccdc_update_config { __u16 update; __u16 flag; enum omap3isp_alaw_ipwidth alawip; - struct omap3isp_ccdc_bclamp __user * bclamp; - struct omap3isp_ccdc_blcomp __user * blcomp; - struct omap3isp_ccdc_fpc __user * fpc; - struct omap3isp_ccdc_lsc_config __user * lsc_cfg; - struct omap3isp_ccdc_culling __user * cull; - __u8 __user * lsc; + struct omap3isp_ccdc_bclamp * bclamp; + struct omap3isp_ccdc_blcomp * blcomp; + struct omap3isp_ccdc_fpc * fpc; + struct omap3isp_ccdc_lsc_config * lsc_cfg; + struct omap3isp_ccdc_culling * cull; + __u8 * lsc; }; #define OMAP3ISP_PREV_LUMAENH (1 << 0) #define OMAP3ISP_PREV_INVALAW (1 << 1) @@ -323,17 +323,17 @@ struct omap3isp_prev_update_config { __u32 update; __u32 flag; __u32 shading_shift; - struct omap3isp_prev_luma __user * luma; - struct omap3isp_prev_hmed __user * hmed; - struct omap3isp_prev_cfa __user * cfa; - struct omap3isp_prev_csup __user * csup; - struct omap3isp_prev_wbal __user * wbal; - struct omap3isp_prev_blkadj __user * blkadj; - struct omap3isp_prev_rgbtorgb __user * rgb2rgb; - struct omap3isp_prev_csc __user * csc; - struct omap3isp_prev_yclimit __user * yclimit; - struct omap3isp_prev_dcor __user * dcor; - struct omap3isp_prev_nf __user * nf; - struct omap3isp_prev_gtables __user * gamma; + struct omap3isp_prev_luma * luma; + struct omap3isp_prev_hmed * hmed; + struct omap3isp_prev_cfa * cfa; + struct omap3isp_prev_csup * csup; + struct omap3isp_prev_wbal * wbal; + struct omap3isp_prev_blkadj * blkadj; + struct omap3isp_prev_rgbtorgb * rgb2rgb; + struct omap3isp_prev_csc * csc; + struct omap3isp_prev_yclimit * yclimit; + struct omap3isp_prev_dcor * dcor; + struct omap3isp_prev_nf * nf; + struct omap3isp_prev_gtables * gamma; }; #endif diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/omapfb.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/omapfb.h index 6ebec085..632e4689 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/omapfb.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/omapfb.h @@ -153,7 +153,7 @@ struct omapfb_memory_read { __u16 w; __u16 h; size_t buffer_size; - void __user * buffer; + void * buffer; }; struct omapfb_ovl_colormode { __u8 overlay_idx; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/ppp-ioctl.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/ppp-ioctl.h index 69c6e6d9..165d4477 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/ppp-ioctl.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/ppp-ioctl.h @@ -56,7 +56,7 @@ struct npioctl { enum NPmode mode; }; struct ppp_option_data { - __u8 __user * ptr; + __u8 * ptr; __u32 length; int transmit; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/route.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/route.h index 4ba6023d..f33327cc 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/route.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/route.h @@ -30,7 +30,7 @@ struct rtentry { unsigned long rt_pad3; void * rt_pad4; short rt_metric; - char __user * rt_dev; + char * rt_dev; unsigned long rt_mtu; #define rt_mss rt_mtu unsigned long rt_window; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/sem.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/sem.h index 98ed1bf3..c2f25e7d 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/sem.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/sem.h @@ -48,10 +48,10 @@ struct sembuf { }; union __kernel_legacy_semun { int val; - struct __kernel_legacy_semid_ds __user * buf; - unsigned short __user * array; - struct seminfo __user * __buf; - void __user * __pad; + struct __kernel_legacy_semid_ds * buf; + unsigned short * array; + struct seminfo * __buf; + void * __pad; }; struct seminfo { int semmap; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/sysctl.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/sysctl.h index ff17f7c5..5714323f 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/sysctl.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/sysctl.h @@ -23,11 +23,11 @@ #include <linux/compiler.h> #define CTL_MAXNAME 10 struct __sysctl_args { - int __user * name; + int * name; int nlen; - void __user * oldval; - size_t __user * oldlenp; - void __user * newval; + void * oldval; + size_t * oldlenp; + void * newval; size_t newlen; unsigned long __linux_unused[4]; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/time.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/time.h index df52295d..55d0e6e9 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/time.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/time.h @@ -18,14 +18,11 @@ ****************************************************************************/ #ifndef _UAPI_LINUX_TIME_H #define _UAPI_LINUX_TIME_H +#include <bits/timespec.h> #include <linux/types.h> #include <linux/time_types.h> #ifndef _STRUCT_TIMESPEC #define _STRUCT_TIMESPEC -struct timespec { - __kernel_old_time_t tv_sec; - long tv_nsec; -}; #endif struct timeval { __kernel_old_time_t tv_sec; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/uhid.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/uhid.h index 228ee503..1d471f84 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/uhid.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/uhid.h @@ -106,7 +106,7 @@ struct uhid_create_req { __u8 name[128]; __u8 phys[64]; __u8 uniq[64]; - __u8 __user * rd_data; + __u8 * rd_data; __u16 rd_size; __u16 bus; __u32 vendor; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/uio.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/uio.h index fa955cd0..04814c71 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/uio.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/uio.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct iovec { - void __user * iov_base; + void * iov_base; __kernel_size_t iov_len; }; #define UIO_FASTIOV 8 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/usb/tmc.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/usb/tmc.h index 6d0add1e..b2672901 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/usb/tmc.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/usb/tmc.h @@ -46,7 +46,7 @@ struct usbtmc_request { } __attribute__((packed)); struct usbtmc_ctrlrequest { struct usbtmc_request req; - void __user * data; + void * data; } __attribute__((packed)); struct usbtmc_termchar { __u8 term_char; @@ -59,7 +59,7 @@ struct usbtmc_message { __u32 transfer_size; __u32 transferred; __u32 flags; - void __user * message; + void * message; } __attribute__((packed)); #define USBTMC_IOC_NR 91 #define USBTMC_IOCTL_INDICATOR_PULSE _IO(USBTMC_IOC_NR, 1) diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/usbdevice_fs.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/usbdevice_fs.h index 5fef522e..af8681b3 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/usbdevice_fs.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/usbdevice_fs.h @@ -27,13 +27,13 @@ struct usbdevfs_ctrltransfer { __u16 wIndex; __u16 wLength; __u32 timeout; - void __user * data; + void * data; }; struct usbdevfs_bulktransfer { unsigned int ep; unsigned int len; unsigned int timeout; - void __user * data; + void * data; }; struct usbdevfs_setinterface { unsigned int interface; @@ -41,7 +41,7 @@ struct usbdevfs_setinterface { }; struct usbdevfs_disconnectsignal { unsigned int signr; - void __user * context; + void * context; }; #define USBDEVFS_MAXDRIVERNAME 255 struct usbdevfs_getdriver { @@ -80,7 +80,7 @@ struct usbdevfs_urb { unsigned char endpoint; int status; unsigned int flags; - void __user * buffer; + void * buffer; int buffer_length; int actual_length; int start_frame; @@ -90,13 +90,13 @@ struct usbdevfs_urb { }; int error_count; unsigned int signr; - void __user * usercontext; + void * usercontext; struct usbdevfs_iso_packet_desc iso_frame_desc[]; }; struct usbdevfs_ioctl { int ifno; int ioctl_code; - void __user * data; + void * data; }; struct usbdevfs_hub_portinfo { char nports; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/uvcvideo.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/uvcvideo.h index 46528a93..f15ed784 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/uvcvideo.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/uvcvideo.h @@ -49,7 +49,7 @@ struct uvc_xu_control_mapping { __u8 offset; __u32 v4l2_type; __u32 data_type; - struct uvc_menu_info __user * menu_info; + struct uvc_menu_info * menu_info; __u32 menu_count; __u32 reserved[4]; }; @@ -58,7 +58,7 @@ struct uvc_xu_control_query { __u8 selector; __u8 query; __u16 size; - __u8 __user * data; + __u8 * data; }; #define UVCIOC_CTRL_MAP _IOWR('u', 0x20, struct uvc_xu_control_mapping) #define UVCIOC_CTRL_QUERY _IOWR('u', 0x21, struct uvc_xu_control_query) diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/vfio.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/vfio.h index 7dc3440f..3c1821c2 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/vfio.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/vfio.h @@ -390,7 +390,7 @@ struct vfio_iommu_type1_dma_map { struct vfio_bitmap { __u64 pgsize; __u64 size; - __u64 __user * data; + __u64 * data; }; struct vfio_iommu_type1_dma_unmap { __u32 argsz; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/videodev2.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/videodev2.h index d418fd20..4fb0a254 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/videodev2.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/videodev2.h @@ -650,7 +650,7 @@ struct v4l2_framebuffer { #define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip __user * next; + struct v4l2_clip * next; }; struct v4l2_window { struct v4l2_rect w; @@ -658,7 +658,7 @@ struct v4l2_window { __u32 chromakey; struct v4l2_clip * clips; __u32 clipcount; - void __user * bitmap; + void * bitmap; __u8 global_alpha; }; struct v4l2_captureparm { @@ -895,32 +895,32 @@ struct v4l2_ext_control { union { __s32 value; __s64 value64; - char __user * string; - __u8 __user * p_u8; - __u16 __user * p_u16; - __u32 __user * p_u32; - __u32 __user * p_s32; - __u32 __user * p_s64; - struct v4l2_area __user * p_area; - struct v4l2_ctrl_h264_sps __user * p_h264_sps; + char * string; + __u8 * p_u8; + __u16 * p_u16; + __u32 * p_u32; + __u32 * p_s32; + __u32 * p_s64; + struct v4l2_area * p_area; + struct v4l2_ctrl_h264_sps * p_h264_sps; struct v4l2_ctrl_h264_pps * p_h264_pps; - struct v4l2_ctrl_h264_scaling_matrix __user * p_h264_scaling_matrix; - struct v4l2_ctrl_h264_pred_weights __user * p_h264_pred_weights; - struct v4l2_ctrl_h264_slice_params __user * p_h264_slice_params; - struct v4l2_ctrl_h264_decode_params __user * p_h264_decode_params; - struct v4l2_ctrl_fwht_params __user * p_fwht_params; - struct v4l2_ctrl_vp8_frame __user * p_vp8_frame; - struct v4l2_ctrl_mpeg2_sequence __user * p_mpeg2_sequence; - struct v4l2_ctrl_mpeg2_picture __user * p_mpeg2_picture; - struct v4l2_ctrl_mpeg2_quantisation __user * p_mpeg2_quantisation; - struct v4l2_ctrl_vp9_compressed_hdr __user * p_vp9_compressed_hdr_probs; - struct v4l2_ctrl_vp9_frame __user * p_vp9_frame; - struct v4l2_ctrl_hevc_sps __user * p_hevc_sps; - struct v4l2_ctrl_hevc_pps __user * p_hevc_pps; - struct v4l2_ctrl_hevc_slice_params __user * p_hevc_slice_params; - struct v4l2_ctrl_hevc_scaling_matrix __user * p_hevc_scaling_matrix; - struct v4l2_ctrl_hevc_decode_params __user * p_hevc_decode_params; - void __user * ptr; + struct v4l2_ctrl_h264_scaling_matrix * p_h264_scaling_matrix; + struct v4l2_ctrl_h264_pred_weights * p_h264_pred_weights; + struct v4l2_ctrl_h264_slice_params * p_h264_slice_params; + struct v4l2_ctrl_h264_decode_params * p_h264_decode_params; + struct v4l2_ctrl_fwht_params * p_fwht_params; + struct v4l2_ctrl_vp8_frame * p_vp8_frame; + struct v4l2_ctrl_mpeg2_sequence * p_mpeg2_sequence; + struct v4l2_ctrl_mpeg2_picture * p_mpeg2_picture; + struct v4l2_ctrl_mpeg2_quantisation * p_mpeg2_quantisation; + struct v4l2_ctrl_vp9_compressed_hdr * p_vp9_compressed_hdr_probs; + struct v4l2_ctrl_vp9_frame * p_vp9_frame; + struct v4l2_ctrl_hevc_sps * p_hevc_sps; + struct v4l2_ctrl_hevc_pps * p_hevc_pps; + struct v4l2_ctrl_hevc_slice_params * p_hevc_slice_params; + struct v4l2_ctrl_hevc_scaling_matrix * p_hevc_scaling_matrix; + struct v4l2_ctrl_hevc_decode_params * p_hevc_decode_params; + void * ptr; }; } __attribute__((packed)); struct v4l2_ext_controls { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/linux/wireless.h b/sysroots/arm-unknown-linux-musleabihf/include/linux/wireless.h index ca31dd23..eb57fff1 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/linux/wireless.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/linux/wireless.h @@ -264,7 +264,7 @@ struct iw_param { __u16 flags; }; struct iw_point { - void __user * pointer; + void * pointer; __u16 length; __u16 flags; }; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/mtd/mtd-abi.h b/sysroots/arm-unknown-linux-musleabihf/include/mtd/mtd-abi.h index 6e26cae8..aed2acc1 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/mtd/mtd-abi.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/mtd/mtd-abi.h @@ -30,7 +30,7 @@ struct erase_info_user64 { struct mtd_oob_buf { __u32 start; __u32 length; - unsigned char __user * ptr; + unsigned char * ptr; }; struct mtd_oob_buf64 { __u64 start; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/scsi/sg.h b/sysroots/arm-unknown-linux-musleabihf/include/scsi/sg.h index 6911b163..9ba6cd64 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/scsi/sg.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/scsi/sg.h @@ -20,7 +20,7 @@ #define _SCSI_GENERIC_H #include <linux/compiler.h> typedef struct sg_iovec { - void __user * iov_base; + void * iov_base; size_t iov_len; } sg_iovec_t; typedef struct sg_io_hdr { @@ -30,13 +30,13 @@ typedef struct sg_io_hdr { unsigned char mx_sb_len; unsigned short iovec_count; unsigned int dxfer_len; - void __user * dxferp; - unsigned char __user * cmdp; - void __user * sbp; + void * dxferp; + unsigned char * cmdp; + void * sbp; unsigned int timeout; unsigned int flags; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned char status; unsigned char masked_status; unsigned char msg_status; @@ -96,7 +96,7 @@ typedef struct sg_req_info { char sg_io_owned; char problem; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned int duration; int unused; } sg_req_info_t; diff --git a/sysroots/arm-unknown-linux-musleabihf/include/sound/asequencer.h b/sysroots/arm-unknown-linux-musleabihf/include/sound/asequencer.h index 0076933a..01a50585 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/sound/asequencer.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/sound/asequencer.h @@ -209,9 +209,9 @@ struct snd_seq_running_info { #define SNDRV_SEQ_CLIENT_DUMMY 14 #define SNDRV_SEQ_CLIENT_OSS 15 typedef int __bitwise snd_seq_client_type_t; -#define NO_CLIENT ((__force snd_seq_client_type_t) 0) -#define USER_CLIENT ((__force snd_seq_client_type_t) 1) -#define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) +#define NO_CLIENT (( snd_seq_client_type_t) 0) +#define USER_CLIENT (( snd_seq_client_type_t) 1) +#define KERNEL_CLIENT (( snd_seq_client_type_t) 2) #define SNDRV_SEQ_FILTER_BROADCAST (1U << 0) #define SNDRV_SEQ_FILTER_MULTICAST (1U << 1) #define SNDRV_SEQ_FILTER_BOUNCE (1U << 2) diff --git a/sysroots/arm-unknown-linux-musleabihf/include/sound/asound.h b/sysroots/arm-unknown-linux-musleabihf/include/sound/asound.h index 6e325e90..9c1a3ae7 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/sound/asound.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/sound/asound.h @@ -96,7 +96,7 @@ struct snd_hwdep_dsp_status { struct snd_hwdep_dsp_image { unsigned int index; unsigned char name[64]; - unsigned char __user * image; + unsigned char * image; size_t length; unsigned long driver_data; }; @@ -125,64 +125,64 @@ enum { SNDRV_PCM_STREAM_LAST = SNDRV_PCM_STREAM_CAPTURE, }; typedef int __bitwise snd_pcm_access_t; -#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((__force snd_pcm_access_t) 0) -#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((__force snd_pcm_access_t) 1) -#define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((__force snd_pcm_access_t) 2) -#define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((__force snd_pcm_access_t) 3) -#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((__force snd_pcm_access_t) 4) +#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED (( snd_pcm_access_t) 0) +#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED (( snd_pcm_access_t) 1) +#define SNDRV_PCM_ACCESS_MMAP_COMPLEX (( snd_pcm_access_t) 2) +#define SNDRV_PCM_ACCESS_RW_INTERLEAVED (( snd_pcm_access_t) 3) +#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED (( snd_pcm_access_t) 4) #define SNDRV_PCM_ACCESS_LAST SNDRV_PCM_ACCESS_RW_NONINTERLEAVED typedef int __bitwise snd_pcm_format_t; -#define SNDRV_PCM_FORMAT_S8 ((__force snd_pcm_format_t) 0) -#define SNDRV_PCM_FORMAT_U8 ((__force snd_pcm_format_t) 1) -#define SNDRV_PCM_FORMAT_S16_LE ((__force snd_pcm_format_t) 2) -#define SNDRV_PCM_FORMAT_S16_BE ((__force snd_pcm_format_t) 3) -#define SNDRV_PCM_FORMAT_U16_LE ((__force snd_pcm_format_t) 4) -#define SNDRV_PCM_FORMAT_U16_BE ((__force snd_pcm_format_t) 5) -#define SNDRV_PCM_FORMAT_S24_LE ((__force snd_pcm_format_t) 6) -#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) -#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) -#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) -#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10) -#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11) -#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12) -#define SNDRV_PCM_FORMAT_U32_BE ((__force snd_pcm_format_t) 13) -#define SNDRV_PCM_FORMAT_FLOAT_LE ((__force snd_pcm_format_t) 14) -#define SNDRV_PCM_FORMAT_FLOAT_BE ((__force snd_pcm_format_t) 15) -#define SNDRV_PCM_FORMAT_FLOAT64_LE ((__force snd_pcm_format_t) 16) -#define SNDRV_PCM_FORMAT_FLOAT64_BE ((__force snd_pcm_format_t) 17) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((__force snd_pcm_format_t) 18) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((__force snd_pcm_format_t) 19) -#define SNDRV_PCM_FORMAT_MU_LAW ((__force snd_pcm_format_t) 20) -#define SNDRV_PCM_FORMAT_A_LAW ((__force snd_pcm_format_t) 21) -#define SNDRV_PCM_FORMAT_IMA_ADPCM ((__force snd_pcm_format_t) 22) -#define SNDRV_PCM_FORMAT_MPEG ((__force snd_pcm_format_t) 23) -#define SNDRV_PCM_FORMAT_GSM ((__force snd_pcm_format_t) 24) -#define SNDRV_PCM_FORMAT_S20_LE ((__force snd_pcm_format_t) 25) -#define SNDRV_PCM_FORMAT_S20_BE ((__force snd_pcm_format_t) 26) -#define SNDRV_PCM_FORMAT_U20_LE ((__force snd_pcm_format_t) 27) -#define SNDRV_PCM_FORMAT_U20_BE ((__force snd_pcm_format_t) 28) -#define SNDRV_PCM_FORMAT_SPECIAL ((__force snd_pcm_format_t) 31) -#define SNDRV_PCM_FORMAT_S24_3LE ((__force snd_pcm_format_t) 32) -#define SNDRV_PCM_FORMAT_S24_3BE ((__force snd_pcm_format_t) 33) -#define SNDRV_PCM_FORMAT_U24_3LE ((__force snd_pcm_format_t) 34) -#define SNDRV_PCM_FORMAT_U24_3BE ((__force snd_pcm_format_t) 35) -#define SNDRV_PCM_FORMAT_S20_3LE ((__force snd_pcm_format_t) 36) -#define SNDRV_PCM_FORMAT_S20_3BE ((__force snd_pcm_format_t) 37) -#define SNDRV_PCM_FORMAT_U20_3LE ((__force snd_pcm_format_t) 38) -#define SNDRV_PCM_FORMAT_U20_3BE ((__force snd_pcm_format_t) 39) -#define SNDRV_PCM_FORMAT_S18_3LE ((__force snd_pcm_format_t) 40) -#define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) -#define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) -#define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) -#define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) -#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) -#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) -#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) -#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) -#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) -#define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) -#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) -#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) +#define SNDRV_PCM_FORMAT_S8 (( snd_pcm_format_t) 0) +#define SNDRV_PCM_FORMAT_U8 (( snd_pcm_format_t) 1) +#define SNDRV_PCM_FORMAT_S16_LE (( snd_pcm_format_t) 2) +#define SNDRV_PCM_FORMAT_S16_BE (( snd_pcm_format_t) 3) +#define SNDRV_PCM_FORMAT_U16_LE (( snd_pcm_format_t) 4) +#define SNDRV_PCM_FORMAT_U16_BE (( snd_pcm_format_t) 5) +#define SNDRV_PCM_FORMAT_S24_LE (( snd_pcm_format_t) 6) +#define SNDRV_PCM_FORMAT_S24_BE (( snd_pcm_format_t) 7) +#define SNDRV_PCM_FORMAT_U24_LE (( snd_pcm_format_t) 8) +#define SNDRV_PCM_FORMAT_U24_BE (( snd_pcm_format_t) 9) +#define SNDRV_PCM_FORMAT_S32_LE (( snd_pcm_format_t) 10) +#define SNDRV_PCM_FORMAT_S32_BE (( snd_pcm_format_t) 11) +#define SNDRV_PCM_FORMAT_U32_LE (( snd_pcm_format_t) 12) +#define SNDRV_PCM_FORMAT_U32_BE (( snd_pcm_format_t) 13) +#define SNDRV_PCM_FORMAT_FLOAT_LE (( snd_pcm_format_t) 14) +#define SNDRV_PCM_FORMAT_FLOAT_BE (( snd_pcm_format_t) 15) +#define SNDRV_PCM_FORMAT_FLOAT64_LE (( snd_pcm_format_t) 16) +#define SNDRV_PCM_FORMAT_FLOAT64_BE (( snd_pcm_format_t) 17) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( snd_pcm_format_t) 18) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( snd_pcm_format_t) 19) +#define SNDRV_PCM_FORMAT_MU_LAW (( snd_pcm_format_t) 20) +#define SNDRV_PCM_FORMAT_A_LAW (( snd_pcm_format_t) 21) +#define SNDRV_PCM_FORMAT_IMA_ADPCM (( snd_pcm_format_t) 22) +#define SNDRV_PCM_FORMAT_MPEG (( snd_pcm_format_t) 23) +#define SNDRV_PCM_FORMAT_GSM (( snd_pcm_format_t) 24) +#define SNDRV_PCM_FORMAT_S20_LE (( snd_pcm_format_t) 25) +#define SNDRV_PCM_FORMAT_S20_BE (( snd_pcm_format_t) 26) +#define SNDRV_PCM_FORMAT_U20_LE (( snd_pcm_format_t) 27) +#define SNDRV_PCM_FORMAT_U20_BE (( snd_pcm_format_t) 28) +#define SNDRV_PCM_FORMAT_SPECIAL (( snd_pcm_format_t) 31) +#define SNDRV_PCM_FORMAT_S24_3LE (( snd_pcm_format_t) 32) +#define SNDRV_PCM_FORMAT_S24_3BE (( snd_pcm_format_t) 33) +#define SNDRV_PCM_FORMAT_U24_3LE (( snd_pcm_format_t) 34) +#define SNDRV_PCM_FORMAT_U24_3BE (( snd_pcm_format_t) 35) +#define SNDRV_PCM_FORMAT_S20_3LE (( snd_pcm_format_t) 36) +#define SNDRV_PCM_FORMAT_S20_3BE (( snd_pcm_format_t) 37) +#define SNDRV_PCM_FORMAT_U20_3LE (( snd_pcm_format_t) 38) +#define SNDRV_PCM_FORMAT_U20_3BE (( snd_pcm_format_t) 39) +#define SNDRV_PCM_FORMAT_S18_3LE (( snd_pcm_format_t) 40) +#define SNDRV_PCM_FORMAT_S18_3BE (( snd_pcm_format_t) 41) +#define SNDRV_PCM_FORMAT_U18_3LE (( snd_pcm_format_t) 42) +#define SNDRV_PCM_FORMAT_U18_3BE (( snd_pcm_format_t) 43) +#define SNDRV_PCM_FORMAT_G723_24 (( snd_pcm_format_t) 44) +#define SNDRV_PCM_FORMAT_G723_24_1B (( snd_pcm_format_t) 45) +#define SNDRV_PCM_FORMAT_G723_40 (( snd_pcm_format_t) 46) +#define SNDRV_PCM_FORMAT_G723_40_1B (( snd_pcm_format_t) 47) +#define SNDRV_PCM_FORMAT_DSD_U8 (( snd_pcm_format_t) 48) +#define SNDRV_PCM_FORMAT_DSD_U16_LE (( snd_pcm_format_t) 49) +#define SNDRV_PCM_FORMAT_DSD_U32_LE (( snd_pcm_format_t) 50) +#define SNDRV_PCM_FORMAT_DSD_U16_BE (( snd_pcm_format_t) 51) +#define SNDRV_PCM_FORMAT_DSD_U32_BE (( snd_pcm_format_t) 52) #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE #define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8 #ifdef SNDRV_LITTLE_ENDIAN @@ -212,7 +212,7 @@ typedef int __bitwise snd_pcm_format_t; #define SNDRV_PCM_FORMAT_U20 SNDRV_PCM_FORMAT_U20_BE #endif typedef int __bitwise snd_pcm_subformat_t; -#define SNDRV_PCM_SUBFORMAT_STD ((__force snd_pcm_subformat_t) 0) +#define SNDRV_PCM_SUBFORMAT_STD (( snd_pcm_subformat_t) 0) #define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD #define SNDRV_PCM_INFO_MMAP 0x00000001 #define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 @@ -243,15 +243,15 @@ typedef int __bitwise snd_pcm_subformat_t; #define __SND_STRUCT_TIME64 #endif typedef int __bitwise snd_pcm_state_t; -#define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) -#define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) -#define SNDRV_PCM_STATE_PREPARED ((__force snd_pcm_state_t) 2) -#define SNDRV_PCM_STATE_RUNNING ((__force snd_pcm_state_t) 3) -#define SNDRV_PCM_STATE_XRUN ((__force snd_pcm_state_t) 4) -#define SNDRV_PCM_STATE_DRAINING ((__force snd_pcm_state_t) 5) -#define SNDRV_PCM_STATE_PAUSED ((__force snd_pcm_state_t) 6) -#define SNDRV_PCM_STATE_SUSPENDED ((__force snd_pcm_state_t) 7) -#define SNDRV_PCM_STATE_DISCONNECTED ((__force snd_pcm_state_t) 8) +#define SNDRV_PCM_STATE_OPEN (( snd_pcm_state_t) 0) +#define SNDRV_PCM_STATE_SETUP (( snd_pcm_state_t) 1) +#define SNDRV_PCM_STATE_PREPARED (( snd_pcm_state_t) 2) +#define SNDRV_PCM_STATE_RUNNING (( snd_pcm_state_t) 3) +#define SNDRV_PCM_STATE_XRUN (( snd_pcm_state_t) 4) +#define SNDRV_PCM_STATE_DRAINING (( snd_pcm_state_t) 5) +#define SNDRV_PCM_STATE_PAUSED (( snd_pcm_state_t) 6) +#define SNDRV_PCM_STATE_SUSPENDED (( snd_pcm_state_t) 7) +#define SNDRV_PCM_STATE_DISCONNECTED (( snd_pcm_state_t) 8) #define SNDRV_PCM_STATE_LAST SNDRV_PCM_STATE_DISCONNECTED enum { SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000, @@ -475,12 +475,12 @@ struct __snd_pcm_sync_ptr64 { }; struct snd_xferi { snd_pcm_sframes_t result; - void __user * buf; + void * buf; snd_pcm_uframes_t frames; }; struct snd_xfern { snd_pcm_sframes_t result; - void __user * __user * bufs; + void * * bufs; snd_pcm_uframes_t frames; }; enum { @@ -776,22 +776,22 @@ struct snd_ctl_card_info { unsigned char components[128]; }; typedef int __bitwise snd_ctl_elem_type_t; -#define SNDRV_CTL_ELEM_TYPE_NONE ((__force snd_ctl_elem_type_t) 0) -#define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((__force snd_ctl_elem_type_t) 1) -#define SNDRV_CTL_ELEM_TYPE_INTEGER ((__force snd_ctl_elem_type_t) 2) -#define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((__force snd_ctl_elem_type_t) 3) -#define SNDRV_CTL_ELEM_TYPE_BYTES ((__force snd_ctl_elem_type_t) 4) -#define SNDRV_CTL_ELEM_TYPE_IEC958 ((__force snd_ctl_elem_type_t) 5) -#define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((__force snd_ctl_elem_type_t) 6) +#define SNDRV_CTL_ELEM_TYPE_NONE (( snd_ctl_elem_type_t) 0) +#define SNDRV_CTL_ELEM_TYPE_BOOLEAN (( snd_ctl_elem_type_t) 1) +#define SNDRV_CTL_ELEM_TYPE_INTEGER (( snd_ctl_elem_type_t) 2) +#define SNDRV_CTL_ELEM_TYPE_ENUMERATED (( snd_ctl_elem_type_t) 3) +#define SNDRV_CTL_ELEM_TYPE_BYTES (( snd_ctl_elem_type_t) 4) +#define SNDRV_CTL_ELEM_TYPE_IEC958 (( snd_ctl_elem_type_t) 5) +#define SNDRV_CTL_ELEM_TYPE_INTEGER64 (( snd_ctl_elem_type_t) 6) #define SNDRV_CTL_ELEM_TYPE_LAST SNDRV_CTL_ELEM_TYPE_INTEGER64 typedef int __bitwise snd_ctl_elem_iface_t; -#define SNDRV_CTL_ELEM_IFACE_CARD ((__force snd_ctl_elem_iface_t) 0) -#define SNDRV_CTL_ELEM_IFACE_HWDEP ((__force snd_ctl_elem_iface_t) 1) -#define SNDRV_CTL_ELEM_IFACE_MIXER ((__force snd_ctl_elem_iface_t) 2) -#define SNDRV_CTL_ELEM_IFACE_PCM ((__force snd_ctl_elem_iface_t) 3) -#define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((__force snd_ctl_elem_iface_t) 4) -#define SNDRV_CTL_ELEM_IFACE_TIMER ((__force snd_ctl_elem_iface_t) 5) -#define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((__force snd_ctl_elem_iface_t) 6) +#define SNDRV_CTL_ELEM_IFACE_CARD (( snd_ctl_elem_iface_t) 0) +#define SNDRV_CTL_ELEM_IFACE_HWDEP (( snd_ctl_elem_iface_t) 1) +#define SNDRV_CTL_ELEM_IFACE_MIXER (( snd_ctl_elem_iface_t) 2) +#define SNDRV_CTL_ELEM_IFACE_PCM (( snd_ctl_elem_iface_t) 3) +#define SNDRV_CTL_ELEM_IFACE_RAWMIDI (( snd_ctl_elem_iface_t) 4) +#define SNDRV_CTL_ELEM_IFACE_TIMER (( snd_ctl_elem_iface_t) 5) +#define SNDRV_CTL_ELEM_IFACE_SEQUENCER (( snd_ctl_elem_iface_t) 6) #define SNDRV_CTL_ELEM_IFACE_LAST SNDRV_CTL_ELEM_IFACE_SEQUENCER #define SNDRV_CTL_ELEM_ACCESS_READ (1 << 0) #define SNDRV_CTL_ELEM_ACCESS_WRITE (1 << 1) @@ -826,7 +826,7 @@ struct snd_ctl_elem_list { unsigned int space; unsigned int used; unsigned int count; - struct snd_ctl_elem_id __user * pids; + struct snd_ctl_elem_id * pids; unsigned char reserved[50]; }; struct snd_ctl_elem_info { diff --git a/sysroots/arm-unknown-linux-musleabihf/include/xen/gntdev.h b/sysroots/arm-unknown-linux-musleabihf/include/xen/gntdev.h index 1e78ac37..eada73c4 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/xen/gntdev.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/xen/gntdev.h @@ -55,7 +55,7 @@ struct ioctl_gntdev_unmap_notify { }; struct gntdev_grant_copy_segment { union { - void __user * virt; + void * virt; struct { grant_ref_t ref; __u16 offset; @@ -69,7 +69,7 @@ struct gntdev_grant_copy_segment { #define IOCTL_GNTDEV_GRANT_COPY _IOC(_IOC_NONE, 'G', 8, sizeof(struct ioctl_gntdev_grant_copy)) struct ioctl_gntdev_grant_copy { unsigned int count; - struct gntdev_grant_copy_segment __user * segments; + struct gntdev_grant_copy_segment * segments; }; #define UNMAP_NOTIFY_CLEAR_BYTE 0x1 #define UNMAP_NOTIFY_SEND_EVENT 0x2 diff --git a/sysroots/arm-unknown-linux-musleabihf/include/xen/privcmd.h b/sysroots/arm-unknown-linux-musleabihf/include/xen/privcmd.h index 145446b4..21d9f840 100644 --- a/sysroots/arm-unknown-linux-musleabihf/include/xen/privcmd.h +++ b/sysroots/arm-unknown-linux-musleabihf/include/xen/privcmd.h @@ -33,13 +33,13 @@ struct privcmd_mmap_entry { struct privcmd_mmap { int num; domid_t dom; - struct privcmd_mmap_entry __user * entry; + struct privcmd_mmap_entry * entry; }; struct privcmd_mmapbatch { int num; domid_t dom; __u64 addr; - xen_pfn_t __user * arr; + xen_pfn_t * arr; }; #define PRIVCMD_MMAPBATCH_MFN_ERROR 0xf0000000U #define PRIVCMD_MMAPBATCH_PAGED_ERROR 0x80000000U @@ -47,17 +47,17 @@ struct privcmd_mmapbatch_v2 { unsigned int num; domid_t dom; __u64 addr; - const xen_pfn_t __user * arr; - int __user * err; + const xen_pfn_t * arr; + int * err; }; struct privcmd_dm_op_buf { - void __user * uptr; + void * uptr; size_t size; }; struct privcmd_dm_op { domid_t dom; __u16 num; - const struct privcmd_dm_op_buf __user * ubufs; + const struct privcmd_dm_op_buf * ubufs; }; struct privcmd_mmap_resource { domid_t dom; diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crt1.o b/sysroots/arm-unknown-linux-musleabihf/lib/crt1.o Binary files differindex fdd16418..32e3070c 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crt1.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crt1.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crtbegin.o b/sysroots/arm-unknown-linux-musleabihf/lib/crtbegin.o Binary files differindex 4f9e67d3..8fd1e293 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crtbegin.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crtbegin.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginS.o b/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginS.o Binary files differindex 4f9e67d3..8fd1e293 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginS.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginS.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginT.o b/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginT.o Binary files differindex 4f9e67d3..8fd1e293 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginT.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crtbeginT.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crtend.o b/sysroots/arm-unknown-linux-musleabihf/lib/crtend.o Binary files differindex 3241a849..8ea3e847 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crtend.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crtend.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crtendS.o b/sysroots/arm-unknown-linux-musleabihf/lib/crtendS.o Binary files differindex 3241a849..8ea3e847 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crtendS.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crtendS.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crti.o b/sysroots/arm-unknown-linux-musleabihf/lib/crti.o Binary files differindex 3c2c1432..133cc7fd 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crti.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crti.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/crtn.o b/sysroots/arm-unknown-linux-musleabihf/lib/crtn.o Binary files differindex ec9329c8..58a628b4 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/crtn.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/crtn.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libc++.a b/sysroots/arm-unknown-linux-musleabihf/lib/libc++.a Binary files differindex 6f2b9b0a..655c8348 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libc++.a +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libc++.a diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libc++.so b/sysroots/arm-unknown-linux-musleabihf/lib/libc++.so Binary files differindex a72ed4db..0af1cfe3 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libc++.so +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libc++.so diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libc++abi.a b/sysroots/arm-unknown-linux-musleabihf/lib/libc++abi.a Binary files differindex 8b44b40f..7d801030 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libc++abi.a +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libc++abi.a diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libc.a b/sysroots/arm-unknown-linux-musleabihf/lib/libc.a Binary files differindex 316793e0..7ae864d2 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libc.a +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libc.a diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl.so b/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl.so Binary files differindex e17539f5..46f195c7 100755 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl.so +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl.so diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl_linker_object.o b/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl_linker_object.o Binary files differindex ef544854..3cf57651 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl_linker_object.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libc_musl_linker_object.o diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/libz.a b/sysroots/arm-unknown-linux-musleabihf/lib/libz.a Binary files differindex 126ecc94..42f4c38d 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/libz.a +++ b/sysroots/arm-unknown-linux-musleabihf/lib/libz.a diff --git a/sysroots/arm-unknown-linux-musleabihf/lib/rcrt1.o b/sysroots/arm-unknown-linux-musleabihf/lib/rcrt1.o Binary files differindex 993b0930..4a750deb 100644 --- a/sysroots/arm-unknown-linux-musleabihf/lib/rcrt1.o +++ b/sysroots/arm-unknown-linux-musleabihf/lib/rcrt1.o diff --git a/sysroots/i686-unknown-linux-musl/NOTICE.bionic b/sysroots/i686-unknown-linux-musl/NOTICE.bionic index 9d555923..4d3a1086 100644 --- a/sysroots/i686-unknown-linux-musl/NOTICE.bionic +++ b/sysroots/i686-unknown-linux-musl/NOTICE.bionic @@ -894,6 +894,34 @@ SUCH DAMAGE. ------------------------------------------------------------------- +Copyright (C) 2023 The Android Open Source Project +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +------------------------------------------------------------------- + Copyright (c) 1980, 1983, 1988, 1993 The Regents of the University of California. All rights reserved. diff --git a/sysroots/i686-unknown-linux-musl/include/asm-arm/asm/signal.h b/sysroots/i686-unknown-linux-musl/include/asm-arm/asm/signal.h index 04243808..90cb8d6a 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-arm/asm/signal.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-arm/asm/signal.h @@ -76,7 +76,7 @@ struct sigaction { #define sa_handler _u._sa_handler #define sa_sigaction _u._sa_sigaction typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/i686-unknown-linux-musl/include/asm-arm64/asm/kvm.h b/sysroots/i686-unknown-linux-musl/include/asm-arm64/asm/kvm.h index ecc2e011..ce0c3188 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-arm64/asm/kvm.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-arm64/asm/kvm.h @@ -121,7 +121,7 @@ struct kvm_vcpu_events { struct kvm_arm_copy_mte_tags { __u64 guest_ipa; __u64 length; - void __user * addr; + void * addr; __u64 flags; __u64 reserved[2]; }; diff --git a/sysroots/i686-unknown-linux-musl/include/asm-generic/poll.h b/sysroots/i686-unknown-linux-musl/include/asm-generic/poll.h index 372bc773..ba6f2e9e 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-generic/poll.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-generic/poll.h @@ -41,8 +41,8 @@ #ifndef POLLRDHUP #define POLLRDHUP 0x2000 #endif -#define POLLFREE (__force __poll_t) 0x4000 -#define POLL_BUSY_LOOP (__force __poll_t) 0x8000 +#define POLLFREE ( __poll_t) 0x4000 +#define POLL_BUSY_LOOP ( __poll_t) 0x8000 struct pollfd { int fd; short events; diff --git a/sysroots/i686-unknown-linux-musl/include/asm-generic/siginfo.h b/sysroots/i686-unknown-linux-musl/include/asm-generic/siginfo.h index c5e4178b..90393bab 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-generic/siginfo.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-generic/siginfo.h @@ -22,7 +22,7 @@ #include <linux/types.h> typedef union sigval { int sival_int; - void __user * sival_ptr; + void * sival_ptr; } sigval_t; #define SI_MAX_SIZE 128 #ifndef __ARCH_SI_BAND_T @@ -58,7 +58,7 @@ union __sifields { __ARCH_SI_CLOCK_T _stime; } _sigchld; struct { - void __user * _addr; + void * _addr; #ifdef __ia64__ int _imm; unsigned int _flags; @@ -70,8 +70,8 @@ union __sifields { short _addr_lsb; struct { char _dummy_bnd[__ADDR_BND_PKEY_PAD]; - void __user * _lower; - void __user * _upper; + void * _lower; + void * _upper; } _addr_bnd; struct { char _dummy_pkey[__ADDR_BND_PKEY_PAD]; @@ -89,7 +89,7 @@ union __sifields { int _fd; } _sigpoll; struct { - void __user * _call_addr; + void * _call_addr; int _syscall; unsigned int _arch; } _sigsys; diff --git a/sysroots/i686-unknown-linux-musl/include/asm-generic/signal-defs.h b/sysroots/i686-unknown-linux-musl/include/asm-generic/signal-defs.h index c7e95040..dea8fbca 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-generic/signal-defs.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-generic/signal-defs.h @@ -55,11 +55,11 @@ #endif #ifndef __ASSEMBLY__ typedef void __signalfn_t(int); -typedef __signalfn_t __user * __sighandler_t; +typedef __signalfn_t * __sighandler_t; typedef void __restorefn_t(void); -typedef __restorefn_t __user * __sigrestore_t; -#define SIG_DFL ((__force __sighandler_t) 0) -#define SIG_IGN ((__force __sighandler_t) 1) -#define SIG_ERR ((__force __sighandler_t) - 1) +typedef __restorefn_t * __sigrestore_t; +#define SIG_DFL (( __sighandler_t) 0) +#define SIG_IGN (( __sighandler_t) 1) +#define SIG_ERR (( __sighandler_t) - 1) #endif #endif diff --git a/sysroots/i686-unknown-linux-musl/include/asm-generic/signal.h b/sysroots/i686-unknown-linux-musl/include/asm-generic/signal.h index 5cb1dce4..9cf393ff 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-generic/signal.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-generic/signal.h @@ -82,7 +82,7 @@ struct sigaction { sigset_t sa_mask; }; typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/sigcontext.h b/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/sigcontext.h index 7d5b4d4d..c7909505 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/sigcontext.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/sigcontext.h @@ -180,7 +180,7 @@ struct sigcontext { __u32 eflags; __u32 esp_at_signal; __u16 ss, __ssh; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; __u32 oldmask; __u32 cr2; }; @@ -215,7 +215,7 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; #ifdef __ILP32__ __u32 __fpstate_pad; #endif diff --git a/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/signal.h b/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/signal.h index cbeeac46..37dce50d 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/signal.h +++ b/sysroots/i686-unknown-linux-musl/include/asm-x86/asm/signal.h @@ -88,7 +88,7 @@ struct sigaction { }; #endif typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/i686-unknown-linux-musl/include/asm/sigcontext.h b/sysroots/i686-unknown-linux-musl/include/asm/sigcontext.h index 7d5b4d4d..c7909505 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm/sigcontext.h +++ b/sysroots/i686-unknown-linux-musl/include/asm/sigcontext.h @@ -180,7 +180,7 @@ struct sigcontext { __u32 eflags; __u32 esp_at_signal; __u16 ss, __ssh; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; __u32 oldmask; __u32 cr2; }; @@ -215,7 +215,7 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; #ifdef __ILP32__ __u32 __fpstate_pad; #endif diff --git a/sysroots/i686-unknown-linux-musl/include/asm/signal.h b/sysroots/i686-unknown-linux-musl/include/asm/signal.h index cbeeac46..37dce50d 100644 --- a/sysroots/i686-unknown-linux-musl/include/asm/signal.h +++ b/sysroots/i686-unknown-linux-musl/include/asm/signal.h @@ -88,7 +88,7 @@ struct sigaction { }; #endif typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/i686-unknown-linux-musl/include/drm/drm.h b/sysroots/i686-unknown-linux-musl/include/drm/drm.h index 878e899e..19544525 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/drm.h @@ -78,19 +78,19 @@ struct drm_version { int version_minor; int version_patchlevel; __kernel_size_t name_len; - char __user * name; + char * name; __kernel_size_t date_len; - char __user * date; + char * date; __kernel_size_t desc_len; - char __user * desc; + char * desc; }; struct drm_unique { __kernel_size_t unique_len; - char __user * unique; + char * unique; }; struct drm_list { int count; - struct drm_version __user * version; + struct drm_version * version; }; struct drm_block { int unused; @@ -202,37 +202,37 @@ struct drm_buf_desc { }; struct drm_buf_info { int count; - struct drm_buf_desc __user * list; + struct drm_buf_desc * list; }; struct drm_buf_free { int count; - int __user * list; + int * list; }; struct drm_buf_pub { int idx; int total; int used; - void __user * address; + void * address; }; struct drm_buf_map { int count; #ifdef __cplusplus - void __user * virt; + void * virt; #else - void __user * __linux_virtual; + void * __linux_virtual; #endif - struct drm_buf_pub __user * list; + struct drm_buf_pub * list; }; struct drm_dma { int context; int send_count; - int __user * send_indices; - int __user * send_sizes; + int * send_indices; + int * send_sizes; enum drm_dma_flags flags; int request_count; int request_size; - int __user * request_indices; - int __user * request_sizes; + int * request_indices; + int * request_sizes; int granted_count; }; enum drm_ctx_flags { @@ -245,7 +245,7 @@ struct drm_ctx { }; struct drm_ctx_res { int count; - struct drm_ctx __user * contexts; + struct drm_ctx * contexts; }; struct drm_draw { drm_drawable_t handle; diff --git a/sysroots/i686-unknown-linux-musl/include/drm/i915_drm.h b/sysroots/i686-unknown-linux-musl/include/drm/i915_drm.h index a8982bf5..794e7849 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/i915_drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/i915_drm.h @@ -287,18 +287,18 @@ typedef struct drm_i915_batchbuffer { int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_batchbuffer_t; typedef struct _drm_i915_cmdbuffer { - char __user * buf; + char * buf; int sz; int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_cmdbuffer_t; typedef struct drm_i915_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_i915_irq_emit_t; typedef struct drm_i915_irq_wait { int irq_seq; @@ -371,7 +371,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_OA_TIMESTAMP_FREQUENCY 57 struct drm_i915_getparam { __s32 param; - int __user * value; + int * value; }; typedef struct drm_i915_getparam drm_i915_getparam_t; #define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1 @@ -387,7 +387,7 @@ typedef struct drm_i915_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_i915_mem_alloc_t; typedef struct drm_i915_mem_free { int region; diff --git a/sysroots/i686-unknown-linux-musl/include/drm/mga_drm.h b/sysroots/i686-unknown-linux-musl/include/drm/mga_drm.h index dc62961d..eb55fa7c 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/mga_drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/mga_drm.h @@ -239,7 +239,7 @@ typedef struct _drm_mga_blit { #define MGA_PARAM_CARD_TYPE 2 typedef struct drm_mga_getparam { int param; - void __user * value; + void * value; } drm_mga_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/i686-unknown-linux-musl/include/drm/r128_drm.h b/sysroots/i686-unknown-linux-musl/include/drm/r128_drm.h index 618b6dca..3e013b17 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/r128_drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/r128_drm.h @@ -204,13 +204,13 @@ typedef struct drm_r128_depth { R128_READ_PIXELS = 0x04 } func; int n; - int __user * x; - int __user * y; - unsigned int __user * buffer; - unsigned char __user * mask; + int * x; + int * y; + unsigned int * buffer; + unsigned char * mask; } drm_r128_depth_t; typedef struct drm_r128_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_r128_stipple_t; typedef struct drm_r128_indirect { int idx; @@ -227,7 +227,7 @@ typedef struct drm_r128_fullscreen { #define R128_PARAM_IRQ_NR 1 typedef struct drm_r128_getparam { int param; - void __user * value; + void * value; } drm_r128_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/i686-unknown-linux-musl/include/drm/radeon_drm.h b/sysroots/i686-unknown-linux-musl/include/drm/radeon_drm.h index 9dc69ad5..3ec6bb3f 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/radeon_drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/radeon_drm.h @@ -479,7 +479,7 @@ typedef struct drm_radeon_clear { unsigned int clear_depth; unsigned int color_mask; unsigned int depth_mask; - drm_radeon_clear_rect_t __user * depth_boxes; + drm_radeon_clear_rect_t * depth_boxes; } drm_radeon_clear_t; typedef struct drm_radeon_vertex { int prim; @@ -498,20 +498,20 @@ typedef struct drm_radeon_vertex2 { int idx; int discard; int nr_states; - drm_radeon_state_t __user * state; + drm_radeon_state_t * state; int nr_prims; - drm_radeon_prim_t __user * prim; + drm_radeon_prim_t * prim; } drm_radeon_vertex2_t; typedef struct drm_radeon_cmd_buffer { int bufsz; - char __user * buf; + char * buf; int nbox; - struct drm_clip_rect __user * boxes; + struct drm_clip_rect * boxes; } drm_radeon_cmd_buffer_t; typedef struct drm_radeon_tex_image { unsigned int x, y; unsigned int width, height; - const void __user * data; + const void * data; } drm_radeon_tex_image_t; typedef struct drm_radeon_texture { unsigned int offset; @@ -519,10 +519,10 @@ typedef struct drm_radeon_texture { int format; int width; int height; - drm_radeon_tex_image_t __user * image; + drm_radeon_tex_image_t * image; } drm_radeon_texture_t; typedef struct drm_radeon_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_radeon_stipple_t; typedef struct drm_radeon_indirect { int idx; @@ -552,7 +552,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_NUM_Z_PIPES 17 typedef struct drm_radeon_getparam { int param; - void __user * value; + void * value; } drm_radeon_getparam_t; #define RADEON_MEM_REGION_GART 1 #define RADEON_MEM_REGION_FB 2 @@ -560,7 +560,7 @@ typedef struct drm_radeon_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_radeon_mem_alloc_t; typedef struct drm_radeon_mem_free { int region; @@ -572,7 +572,7 @@ typedef struct drm_radeon_mem_init_heap { int start; } drm_radeon_mem_init_heap_t; typedef struct drm_radeon_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_radeon_irq_emit_t; typedef struct drm_radeon_irq_wait { int irq_seq; diff --git a/sysroots/i686-unknown-linux-musl/include/drm/savage_drm.h b/sysroots/i686-unknown-linux-musl/include/drm/savage_drm.h index ae87d21b..efc0ae6b 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/savage_drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/savage_drm.h @@ -68,14 +68,14 @@ typedef struct drm_savage_init { } drm_savage_init_t; typedef union drm_savage_cmd_header drm_savage_cmd_header_t; typedef struct drm_savage_cmdbuf { - drm_savage_cmd_header_t __user * cmd_addr; + drm_savage_cmd_header_t * cmd_addr; unsigned int size; unsigned int dma_idx; int discard; - unsigned int __user * vb_addr; + unsigned int * vb_addr; unsigned int vb_size; unsigned int vb_stride; - struct drm_clip_rect __user * box_addr; + struct drm_clip_rect * box_addr; unsigned int nbox; } drm_savage_cmdbuf_t; #define SAVAGE_WAIT_2D 0x1 diff --git a/sysroots/i686-unknown-linux-musl/include/drm/via_drm.h b/sysroots/i686-unknown-linux-musl/include/drm/via_drm.h index 9ef645a1..95a149b6 100644 --- a/sysroots/i686-unknown-linux-musl/include/drm/via_drm.h +++ b/sysroots/i686-unknown-linux-musl/include/drm/via_drm.h @@ -125,7 +125,7 @@ typedef struct _drm_via_dma_init { unsigned long reg_pause_addr; } drm_via_dma_init_t; typedef struct _drm_via_cmdbuffer { - char __user * buf; + char * buf; unsigned long size; } drm_via_cmdbuffer_t; typedef struct _drm_via_tex_region { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/atm.h b/sysroots/i686-unknown-linux-musl/include/linux/atm.h index 488fa05a..72d329df 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/atm.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/atm.h @@ -140,7 +140,7 @@ struct sockaddr_atmsvc { struct atmif_sioc { int number; int length; - void __user * arg; + void * arg; }; typedef unsigned short atm_backend_t; #endif diff --git a/sysroots/i686-unknown-linux-musl/include/linux/atmdev.h b/sysroots/i686-unknown-linux-musl/include/linux/atmdev.h index 69eb2400..74cdfc14 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/atmdev.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/atmdev.h @@ -86,7 +86,7 @@ struct atm_dev_stats { #define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG) struct atm_iobuf { int length; - void __user * buffer; + void * buffer; }; #define ATM_CI_MAX - 1 struct atm_cirange { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/blkpg.h b/sysroots/i686-unknown-linux-musl/include/linux/blkpg.h index fdde696e..bfe504ff 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/blkpg.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/blkpg.h @@ -25,7 +25,7 @@ struct blkpg_ioctl_arg { int op; int flags; int datalen; - void __user * data; + void * data; }; #define BLKPG_ADD_PARTITION 1 #define BLKPG_DEL_PARTITION 2 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/btrfs.h b/sysroots/i686-unknown-linux-musl/include/linux/btrfs.h index 80396255..0fdac660 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/btrfs.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/btrfs.h @@ -79,7 +79,7 @@ struct btrfs_ioctl_vol_args_v2 { union { struct { __u64 size; - struct btrfs_qgroup_inherit __user * qgroup_inherit; + struct btrfs_qgroup_inherit * qgroup_inherit; }; __u64 unused[4]; }; @@ -432,7 +432,7 @@ struct btrfs_ioctl_received_subvol_args { struct btrfs_ioctl_send_args { __s64 send_fd; __u64 clone_sources_count; - __u64 __user * clone_sources; + __u64 * clone_sources; __u64 parent_root; __u64 flags; __u32 version; @@ -469,7 +469,7 @@ struct btrfs_ioctl_get_subvol_rootref_args { __u8 align[7]; }; struct btrfs_ioctl_encoded_io_args { - const struct iovec __user * iov; + const struct iovec * iov; unsigned long iovcnt; __s64 offset; __u64 flags; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/byteorder/big_endian.h b/sysroots/i686-unknown-linux-musl/include/linux/byteorder/big_endian.h index b6c978b4..82c5a4cd 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/byteorder/big_endian.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/byteorder/big_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) (__u32) (x)) -#define __constant_ntohl(x) ((__force __u32) (__be32) (x)) -#define __constant_htons(x) ((__force __be16) (__u16) (x)) -#define __constant_ntohs(x) ((__force __u16) (__be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) ___constant_swab64((x))) -#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) ___constant_swab32((x))) -#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) ___constant_swab16((x))) -#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __constant_be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __constant_be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __constant_be16_to_cpu(x) ((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) __swab64((x))) -#define __le64_to_cpu(x) __swab64((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) __swab32((x))) -#define __le32_to_cpu(x) __swab32((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) __swab16((x))) -#define __le16_to_cpu(x) __swab16((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __be16_to_cpu(x) ((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) (__u32) (x)) +#define __constant_ntohl(x) (( __u32) (__be32) (x)) +#define __constant_htons(x) (( __be16) (__u16) (x)) +#define __constant_ntohs(x) (( __u16) (__be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) ___constant_swab64((x))) +#define __constant_le64_to_cpu(x) ___constant_swab64(( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) ___constant_swab32((x))) +#define __constant_le32_to_cpu(x) ___constant_swab32(( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) ___constant_swab16((x))) +#define __constant_le16_to_cpu(x) ___constant_swab16(( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __constant_be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __constant_be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __constant_be16_to_cpu(x) (( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) __swab64((x))) +#define __le64_to_cpu(x) __swab64(( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) __swab32((x))) +#define __le32_to_cpu(x) __swab32(( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) __swab16((x))) +#define __le16_to_cpu(x) __swab16(( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __be16_to_cpu(x) (( __u16) (__be16) (x)) #define __cpu_to_le64s(x) __swab64s((x)) #define __le64_to_cpus(x) __swab64s((x)) #define __cpu_to_le32s(x) __swab32s((x)) diff --git a/sysroots/i686-unknown-linux-musl/include/linux/byteorder/little_endian.h b/sysroots/i686-unknown-linux-musl/include/linux/byteorder/little_endian.h index a272d4d1..28155b5e 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/byteorder/little_endian.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/byteorder/little_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32) (x)) -#define __constant_htons(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __constant_le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __constant_le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __constant_le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) ___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) __swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) __swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) __swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) ___constant_swab32((x))) +#define __constant_ntohl(x) ___constant_swab32(( __be32) (x)) +#define __constant_htons(x) (( __be16) ___constant_swab16((x))) +#define __constant_ntohs(x) ___constant_swab16(( __be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __constant_le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __constant_le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __constant_le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) ___constant_swab64((x))) +#define __constant_be64_to_cpu(x) ___constant_swab64(( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) ___constant_swab32((x))) +#define __constant_be32_to_cpu(x) ___constant_swab32(( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) ___constant_swab16((x))) +#define __constant_be16_to_cpu(x) ___constant_swab16(( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) __swab64((x))) +#define __be64_to_cpu(x) __swab64(( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) __swab32((x))) +#define __be32_to_cpu(x) __swab32(( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) __swab16((x))) +#define __be16_to_cpu(x) __swab16(( __u16) (__be16) (x)) #define __cpu_to_le64s(x) do { (void) (x); } while(0) #define __le64_to_cpus(x) do { (void) (x); } while(0) #define __cpu_to_le32s(x) do { (void) (x); } while(0) diff --git a/sysroots/i686-unknown-linux-musl/include/linux/capability.h b/sysroots/i686-unknown-linux-musl/include/linux/capability.h index c1b5dbff..8f3281ed 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/capability.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/capability.h @@ -28,12 +28,12 @@ typedef struct __user_cap_header_struct { __u32 version; int pid; -} __user * cap_user_header_t; +} * cap_user_header_t; typedef struct __user_cap_data_struct { __u32 effective; __u32 permitted; __u32 inheritable; -} __user * cap_user_data_t; +} * cap_user_data_t; #define VFS_CAP_REVISION_MASK 0xFF000000 #define VFS_CAP_REVISION_SHIFT 24 #define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK diff --git a/sysroots/i686-unknown-linux-musl/include/linux/capi.h b/sysroots/i686-unknown-linux-musl/include/linux/capi.h index de2a8390..a09f9bc7 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/capi.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/capi.h @@ -51,7 +51,7 @@ typedef struct capi_profile { #define CAPI_GET_PROFILE _IOWR('C', 0x09, struct capi_profile) typedef struct capi_manufacturer_cmd { unsigned long cmd; - void __user * data; + void * data; } capi_manufacturer_cmd; #define CAPI_MANUFACTURER_CMD _IOWR('C', 0x20, struct capi_manufacturer_cmd) #define CAPI_GET_ERRCODE _IOR('C', 0x21, __u16) diff --git a/sysroots/i686-unknown-linux-musl/include/linux/cciss_ioctl.h b/sysroots/i686-unknown-linux-musl/include/linux/cciss_ioctl.h index 3e9bb3b0..827e6a00 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/cciss_ioctl.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/cciss_ioctl.h @@ -47,7 +47,7 @@ typedef struct _IOCTL_Command_struct { RequestBlock_struct Request; ErrorInfo_struct error_info; WORD buf_size; - BYTE __user * buf; + BYTE * buf; } IOCTL_Command_struct; typedef struct _BIG_IOCTL_Command_struct { LUNAddr_struct LUN_info; @@ -55,7 +55,7 @@ typedef struct _BIG_IOCTL_Command_struct { ErrorInfo_struct error_info; DWORD malloc_size; DWORD buf_size; - BYTE __user * buf; + BYTE * buf; } BIG_IOCTL_Command_struct; typedef struct _LogvolInfo_struct { __u32 LunID; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/cdrom.h b/sysroots/i686-unknown-linux-musl/include/linux/cdrom.h index 0fe07275..bd1d7df9 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/cdrom.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/cdrom.h @@ -128,7 +128,7 @@ struct cdrom_read_audio { union cdrom_addr addr; __u8 addr_format; int nframes; - __u8 __user * buf; + __u8 * buf; }; struct cdrom_multisession { union cdrom_addr addr; @@ -149,16 +149,16 @@ struct cdrom_blk { #define CGC_DATA_NONE 3 struct cdrom_generic_command { unsigned char cmd[CDROM_PACKET_SIZE]; - unsigned char __user * buffer; + unsigned char * buffer; unsigned int buflen; int stat; - struct request_sense __user * sense; + struct request_sense * sense; unsigned char data_direction; int quiet; int timeout; union { - void __user * reserved[1]; - void __user * unused; + void * reserved[1]; + void * unused; }; }; struct cdrom_timed_media_change_info { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/chio.h b/sysroots/i686-unknown-linux-musl/include/linux/chio.h index 725e7608..74f286f9 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/chio.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/chio.h @@ -71,7 +71,7 @@ struct changer_position { #define CP_INVERT 1 struct changer_element_status { int ces_type; - unsigned char __user * ces_data; + unsigned char * ces_data; }; #define CESTATUS_FULL 0x01 #define CESTATUS_IMPEXP 0x02 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/coda.h b/sysroots/i686-unknown-linux-musl/include/linux/coda.h index aad1b97b..5795cdf1 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/coda.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/coda.h @@ -505,13 +505,13 @@ union coda_downcalls { }; #define PIOCPARM_MASK 0x0000ffff struct ViceIoctl { - void __user * in; - void __user * out; + void * in; + void * out; u_short in_size; u_short out_size; }; struct PioctlData { - const char __user * path; + const char * path; int follow; struct ViceIoctl vi; }; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/comedi.h b/sysroots/i686-unknown-linux-musl/include/linux/comedi.h index e0d015a3..465d1bfc 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/comedi.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/comedi.h @@ -244,14 +244,14 @@ enum comedi_counter_status_flags { struct comedi_insn { unsigned int insn; unsigned int n; - unsigned int __user * data; + unsigned int * data; unsigned int subdev; unsigned int chanspec; unsigned int unused[3]; }; struct comedi_insnlist { unsigned int n_insns; - struct comedi_insn __user * insns; + struct comedi_insn * insns; }; struct comedi_cmd { unsigned int subdev; @@ -268,19 +268,19 @@ struct comedi_cmd { unsigned int stop_arg; unsigned int * chanlist; unsigned int chanlist_len; - short __user * data; + short * data; unsigned int data_len; }; struct comedi_chaninfo { unsigned int subdev; - unsigned int __user * maxdata_list; - unsigned int __user * flaglist; - unsigned int __user * rangelist; + unsigned int * maxdata_list; + unsigned int * flaglist; + unsigned int * rangelist; unsigned int unused[4]; }; struct comedi_rangeinfo { unsigned int range_type; - void __user * range_ptr; + void * range_ptr; }; struct comedi_krange { int min; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/compiler.h b/sysroots/i686-unknown-linux-musl/include/linux/compiler.h index 8e89655c..42d59aa4 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/compiler.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/compiler.h @@ -1,18 +1,11 @@ -#ifndef _UAPI_LINUX_COMPILER_H -#define _UAPI_LINUX_COMPILER_H +#pragma once /* - * This file is not currently in the Linux kernel tree. - * Upstream uapi headers refer to <linux/compiler.h> but there is - * no such uapi file. We've sent this upstream, and are optimistically - * adding it to bionic in the meantime. This should be replaced by - * a scrubbed header from external/kernel-headers when possible. + * There is no `include/uapi/linux/compiler.h`, just `include/linux/compiler.h`. * - * An alternative to this file is to check in a symbolic link to the - * non-uapi <linux/compiler.h>. That's fine for building bionic too. + * We don't need anything _in_ this file, but we do need this file. + * The two #defines are for backwards compatibility. */ -#define __user #define __force - -#endif /* _UAPI_LINUX_COMPILER_H */ +#define __user diff --git a/sysroots/i686-unknown-linux-musl/include/linux/compiler_types.h b/sysroots/i686-unknown-linux-musl/include/linux/compiler_types.h index 94f4fbe5..859ae055 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/compiler_types.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/compiler_types.h @@ -1,5 +1,11 @@ +#pragma once + /* - * The compiler.h file has been split into compiler.h and compiler_types.h. - * However, to compile bionic we only need the compiler.h. + * There is no `include/uapi/linux/compiler_types.h`, just + * `include/linux/compiler_types.h`. + * + * We don't need anything _in_ this file, but we do need this file. + * The #include is for backwards compatibility. */ + #include <linux/compiler.h> diff --git a/sysroots/i686-unknown-linux-musl/include/linux/cxl_mem.h b/sysroots/i686-unknown-linux-musl/include/linux/cxl_mem.h index 578cefd2..c94af873 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/cxl_mem.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/cxl_mem.h @@ -44,7 +44,7 @@ struct cxl_command_info { struct cxl_mem_query_commands { __u32 n_commands; __u32 rsvd; - struct cxl_command_info __user commands[]; + struct cxl_command_info commands[]; }; struct cxl_send_command { __u32 id; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/dlm_device.h b/sysroots/i686-unknown-linux-musl/include/linux/dlm_device.h index 5e54d2e4..e1b0c6d7 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/dlm_device.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/dlm_device.h @@ -33,11 +33,11 @@ struct dlm_lock_params { __u32 parent; __u64 xid; __u64 timeout; - void __user * castparam; - void __user * castaddr; - void __user * bastparam; - void __user * bastaddr; - struct dlm_lksb __user * lksb; + void * castparam; + void * castaddr; + void * bastparam; + void * bastaddr; + struct dlm_lksb * lksb; char lvb[DLM_USER_LVB_LEN]; char name[]; }; @@ -67,9 +67,9 @@ struct dlm_device_version { struct dlm_lock_result { __u32 version[3]; __u32 length; - void __user * user_astaddr; - void __user * user_astparam; - struct dlm_lksb __user * user_lksb; + void * user_astaddr; + void * user_astparam; + struct dlm_lksb * user_lksb; struct dlm_lksb lksb; __u8 bast_mode; __u8 unused[3]; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/dvb/osd.h b/sysroots/i686-unknown-linux-musl/include/linux/dvb/osd.h index 84b268b9..379294ed 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/dvb/osd.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/dvb/osd.h @@ -50,7 +50,7 @@ typedef struct osd_cmd_s { int x1; int y1; int color; - void __user * data; + void * data; } osd_cmd_t; typedef enum { OSD_BITMAP1, diff --git a/sysroots/i686-unknown-linux-musl/include/linux/dvb/video.h b/sysroots/i686-unknown-linux-musl/include/linux/dvb/video.h index 6577e1ff..24587666 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/dvb/video.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/dvb/video.h @@ -94,7 +94,7 @@ struct video_status { video_displayformat_t display_format; }; struct video_still_picture { - char __user * iFrame; + char * iFrame; __s32 size; }; typedef __u16 video_attributes_t; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/eventpoll.h b/sysroots/i686-unknown-linux-musl/include/linux/eventpoll.h index 2a1a26a6..de4c1f1c 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/eventpoll.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/eventpoll.h @@ -25,23 +25,23 @@ #define EPOLL_CTL_ADD 1 #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 -#define EPOLLIN (__force __poll_t) 0x00000001 -#define EPOLLPRI (__force __poll_t) 0x00000002 -#define EPOLLOUT (__force __poll_t) 0x00000004 -#define EPOLLERR (__force __poll_t) 0x00000008 -#define EPOLLHUP (__force __poll_t) 0x00000010 -#define EPOLLNVAL (__force __poll_t) 0x00000020 -#define EPOLLRDNORM (__force __poll_t) 0x00000040 -#define EPOLLRDBAND (__force __poll_t) 0x00000080 -#define EPOLLWRNORM (__force __poll_t) 0x00000100 -#define EPOLLWRBAND (__force __poll_t) 0x00000200 -#define EPOLLMSG (__force __poll_t) 0x00000400 -#define EPOLLRDHUP (__force __poll_t) 0x00002000 -#define EPOLL_URING_WAKE ((__force __poll_t) (1U << 27)) -#define EPOLLEXCLUSIVE ((__force __poll_t) (1U << 28)) -#define EPOLLWAKEUP ((__force __poll_t) (1U << 29)) -#define EPOLLONESHOT ((__force __poll_t) (1U << 30)) -#define EPOLLET ((__force __poll_t) (1U << 31)) +#define EPOLLIN ( __poll_t) 0x00000001 +#define EPOLLPRI ( __poll_t) 0x00000002 +#define EPOLLOUT ( __poll_t) 0x00000004 +#define EPOLLERR ( __poll_t) 0x00000008 +#define EPOLLHUP ( __poll_t) 0x00000010 +#define EPOLLNVAL ( __poll_t) 0x00000020 +#define EPOLLRDNORM ( __poll_t) 0x00000040 +#define EPOLLRDBAND ( __poll_t) 0x00000080 +#define EPOLLWRNORM ( __poll_t) 0x00000100 +#define EPOLLWRBAND ( __poll_t) 0x00000200 +#define EPOLLMSG ( __poll_t) 0x00000400 +#define EPOLLRDHUP ( __poll_t) 0x00002000 +#define EPOLL_URING_WAKE (( __poll_t) (1U << 27)) +#define EPOLLEXCLUSIVE (( __poll_t) (1U << 28)) +#define EPOLLWAKEUP (( __poll_t) (1U << 29)) +#define EPOLLONESHOT (( __poll_t) (1U << 30)) +#define EPOLLET (( __poll_t) (1U << 31)) #ifdef __x86_64__ #define EPOLL_PACKED __attribute__((packed)) #else diff --git a/sysroots/i686-unknown-linux-musl/include/linux/fd.h b/sysroots/i686-unknown-linux-musl/include/linux/fd.h index 4d72d695..dc1d4446 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/fd.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/fd.h @@ -175,7 +175,7 @@ struct floppy_raw_cmd { #define FD_RAW_SOFTFAILURE 0x800 #define FD_RAW_FAILURE 0x10000 #define FD_RAW_HARDFAILURE 0x20000 - void __user * data; + void * data; char * kernel_data; struct floppy_raw_cmd * next; long length; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/filter.h b/sysroots/i686-unknown-linux-musl/include/linux/filter.h index d13c59d3..57fe2fbe 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/filter.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/filter.h @@ -31,7 +31,7 @@ struct sock_filter { }; struct sock_fprog { unsigned short len; - struct sock_filter __user * filter; + struct sock_filter * filter; }; #define BPF_RVAL(code) ((code) & 0x18) #define BPF_A 0x10 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/fs.h b/sysroots/i686-unknown-linux-musl/include/linux/fs.h index 96f91812..b8bfaacf 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/fs.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/fs.h @@ -190,10 +190,10 @@ struct fsxattr { #define SYNC_FILE_RANGE_WAIT_AFTER 4 #define SYNC_FILE_RANGE_WRITE_AND_WAIT (SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WAIT_AFTER) typedef int __bitwise __kernel_rwf_t; -#define RWF_HIPRI ((__force __kernel_rwf_t) 0x00000001) -#define RWF_DSYNC ((__force __kernel_rwf_t) 0x00000002) -#define RWF_SYNC ((__force __kernel_rwf_t) 0x00000004) -#define RWF_NOWAIT ((__force __kernel_rwf_t) 0x00000008) -#define RWF_APPEND ((__force __kernel_rwf_t) 0x00000010) +#define RWF_HIPRI (( __kernel_rwf_t) 0x00000001) +#define RWF_DSYNC (( __kernel_rwf_t) 0x00000002) +#define RWF_SYNC (( __kernel_rwf_t) 0x00000004) +#define RWF_NOWAIT (( __kernel_rwf_t) 0x00000008) +#define RWF_APPEND (( __kernel_rwf_t) 0x00000010) #define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND) #endif diff --git a/sysroots/i686-unknown-linux-musl/include/linux/futex.h b/sysroots/i686-unknown-linux-musl/include/linux/futex.h index c80b90c5..8d1a2a45 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/futex.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/futex.h @@ -59,12 +59,12 @@ struct futex_waitv { __u32 __reserved; }; struct robust_list { - struct robust_list __user * next; + struct robust_list * next; }; struct robust_list_head { struct robust_list list; long futex_offset; - struct robust_list __user * list_op_pending; + struct robust_list * list_op_pending; }; #define FUTEX_WAITERS 0x80000000 #define FUTEX_OWNER_DIED 0x40000000 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/i2c-dev.h b/sysroots/i686-unknown-linux-musl/include/linux/i2c-dev.h index 07fdda2b..7a25e20e 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/i2c-dev.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/i2c-dev.h @@ -33,10 +33,10 @@ struct i2c_smbus_ioctl_data { __u8 read_write; __u8 command; __u32 size; - union i2c_smbus_data __user * data; + union i2c_smbus_data * data; }; struct i2c_rdwr_ioctl_data { - struct i2c_msg __user * msgs; + struct i2c_msg * msgs; __u32 nmsgs; }; #define I2C_RDWR_IOCTL_MAX_MSGS 42 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/i2o-dev.h b/sysroots/i686-unknown-linux-musl/include/linux/i2o-dev.h index fc8b26d0..afaae74c 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/i2o-dev.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/i2o-dev.h @@ -42,38 +42,38 @@ struct i2o_cmd_passthru32 { }; struct i2o_cmd_passthru { unsigned int iop; - void __user * msg; + void * msg; }; struct i2o_cmd_hrtlct { unsigned int iop; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_cmd_psetget { unsigned int iop; unsigned int tid; - void __user * opbuf; + void * opbuf; unsigned int oplen; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_sw_xfer { unsigned int iop; unsigned char flags; unsigned char sw_type; unsigned int sw_id; - void __user * buf; - unsigned int __user * swlen; - unsigned int __user * maxfrag; - unsigned int __user * curfrag; + void * buf; + unsigned int * swlen; + unsigned int * maxfrag; + unsigned int * curfrag; }; struct i2o_html { unsigned int iop; unsigned int tid; unsigned int page; - void __user * resbuf; - unsigned int __user * reslen; - void __user * qbuf; + void * resbuf; + unsigned int * reslen; + void * qbuf; unsigned int qlen; }; #define I2O_EVT_Q_LEN 32 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/if.h b/sysroots/i686-unknown-linux-musl/include/linux/if.h index 63c77ebd..fc6d20d7 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/if.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/if.h @@ -130,14 +130,14 @@ struct if_settings { unsigned int type; unsigned int size; union { - raw_hdlc_proto __user * raw_hdlc; - cisco_proto __user * cisco; - fr_proto __user * fr; - fr_proto_pvc __user * fr_pvc; - fr_proto_pvc_info __user * fr_pvc_info; - x25_hdlc_proto __user * x25; - sync_serial_settings __user * sync; - te1_settings __user * te1; + raw_hdlc_proto * raw_hdlc; + cisco_proto * cisco; + fr_proto * fr; + fr_proto_pvc * fr_pvc; + fr_proto_pvc_info * fr_pvc_info; + x25_hdlc_proto * x25; + sync_serial_settings * sync; + te1_settings * te1; } ifs_ifsu; }; #if __UAPI_DEF_IF_IFREQ @@ -158,7 +158,7 @@ struct ifreq { struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; char ifru_newname[IFNAMSIZ]; - void __user * ifru_data; + void * ifru_data; struct if_settings ifru_settings; } ifr_ifru; }; @@ -184,8 +184,8 @@ struct ifreq { struct ifconf { int ifc_len; union { - char __user * ifcu_buf; - struct ifreq __user * ifcu_req; + char * ifcu_buf; + struct ifreq * ifcu_req; } ifc_ifcu; }; #endif diff --git a/sysroots/i686-unknown-linux-musl/include/linux/if_tunnel.h b/sysroots/i686-unknown-linux-musl/include/linux/if_tunnel.h index 01c2dc93..9b85568e 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/if_tunnel.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/if_tunnel.h @@ -142,7 +142,7 @@ enum { __IFLA_GRE_MAX, }; #define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) -#define VTI_ISVTI ((__force __be16) 0x0001) +#define VTI_ISVTI (( __be16) 0x0001) enum { IFLA_VTI_UNSPEC, IFLA_VTI_LINK, diff --git a/sysroots/i686-unknown-linux-musl/include/linux/input.h b/sysroots/i686-unknown-linux-musl/include/linux/input.h index 4858c817..1df1398f 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/input.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/input.h @@ -173,7 +173,7 @@ struct ff_periodic_effect { __u16 phase; struct ff_envelope envelope; __u32 custom_len; - __s16 __user * custom_data; + __s16 * custom_data; }; struct ff_rumble_effect { __u16 strong_magnitude; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/ipc.h b/sysroots/i686-unknown-linux-musl/include/linux/ipc.h index a0699cf3..4ca9ee15 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/ipc.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/ipc.h @@ -42,7 +42,7 @@ struct __kernel_legacy_ipc_perm { #define IPC_OLD 0 #define IPC_64 0x0100 struct ipc_kludge { - struct msgbuf __user * msgp; + struct msgbuf * msgp; long msgtyp; }; #define SEMOP 1 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/ipmi.h b/sysroots/i686-unknown-linux-musl/include/linux/ipmi.h index dd88f2f7..bd73b3c3 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/ipmi.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/ipmi.h @@ -65,7 +65,7 @@ struct ipmi_msg { unsigned char netfn; unsigned char cmd; unsigned short data_len; - unsigned char __user * data; + unsigned char * data; }; struct kernel_ipmi_msg { unsigned char netfn; @@ -86,7 +86,7 @@ struct kernel_ipmi_msg { #define IPMI_MAINTENANCE_MODE_ON 2 #define IPMI_IOC_MAGIC 'i' struct ipmi_req { - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; @@ -100,7 +100,7 @@ struct ipmi_req_settime { #define IPMICTL_SEND_COMMAND_SETTIME _IOR(IPMI_IOC_MAGIC, 21, struct ipmi_req_settime) struct ipmi_recv { int recv_type; - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/ivtv.h b/sysroots/i686-unknown-linux-musl/include/linux/ivtv.h index 549d6a89..bdd526ed 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/ivtv.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/ivtv.h @@ -24,8 +24,8 @@ struct ivtv_dma_frame { enum v4l2_buf_type type; __u32 pixelformat; - void __user * y_source; - void __user * uv_source; + void * y_source; + void * uv_source; struct v4l2_rect src; struct v4l2_rect dst; __u32 src_width; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/ivtvfb.h b/sysroots/i686-unknown-linux-musl/include/linux/ivtvfb.h index 9addcbf9..171be74d 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/ivtvfb.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/ivtvfb.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct ivtvfb_dma_frame { - void __user * source; + void * source; unsigned long dest_offset; int count; }; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/kd.h b/sysroots/i686-unknown-linux-musl/include/linux/kd.h index 2385037f..903681b7 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/kd.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/kd.h @@ -27,7 +27,7 @@ struct consolefontdesc { unsigned short charcount; unsigned short charheight; - char __user * chardata; + char * chardata; }; #define PIO_FONTRESET 0x4B6D #define GIO_CMAP 0x4B70 @@ -68,7 +68,7 @@ struct unipair { }; struct unimapdesc { unsigned short entry_ct; - struct unipair __user * entries; + struct unipair * entries; }; #define PIO_UNIMAP 0x4B67 #define PIO_UNIMAPCLR 0x4B68 @@ -147,7 +147,7 @@ struct console_font_op { unsigned int flags; unsigned int width, height; unsigned int charcount; - unsigned char __user * data; + unsigned char * data; }; struct console_font { unsigned int width, height; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/keyctl.h b/sysroots/i686-unknown-linux-musl/include/linux/keyctl.h index 01ea576d..b534f5eb 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/keyctl.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/keyctl.h @@ -80,8 +80,8 @@ struct keyctl_dh_params { __s32 base; }; struct keyctl_kdf_params { - char __user * hashname; - char __user * otherinfo; + char * hashname; + char * otherinfo; __u32 otherinfolen; __u32 __spare[8]; }; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/kvm.h b/sysroots/i686-unknown-linux-musl/include/linux/kvm.h index 9566f01d..9d33399f 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/kvm.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/kvm.h @@ -457,7 +457,7 @@ struct kvm_dirty_log { __u32 slot; __u32 padding1; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; @@ -466,7 +466,7 @@ struct kvm_clear_dirty_log { __u32 num_pages; __u64 first_page; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/media.h b/sysroots/i686-unknown-linux-musl/include/linux/media.h index 869d47b4..fe97e90f 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/media.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/media.h @@ -125,8 +125,8 @@ struct media_link_desc { }; struct media_links_enum { __u32 entity; - struct media_pad_desc __user * pads; - struct media_link_desc __user * links; + struct media_pad_desc * pads; + struct media_link_desc * links; __u32 reserved[4]; }; #define MEDIA_INTF_T_DVB_BASE 0x00000100 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h index 862f514f..b1fb5377 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h @@ -98,7 +98,7 @@ struct arpt_replace { unsigned int hook_entry[NF_ARP_NUMHOOKS]; unsigned int underflow[NF_ARP_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct arpt_entry entries[]; }; struct arpt_get_entries { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h index 7c8f435c..d87d65e6 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h @@ -42,10 +42,10 @@ struct ebt_replace { unsigned int valid_hooks; unsigned int nentries; unsigned int entries_size; - struct ebt_entries __user * hook_entry[NF_BR_NUMHOOKS]; + struct ebt_entries * hook_entry[NF_BR_NUMHOOKS]; unsigned int num_counters; - struct ebt_counter __user * counters; - char __user * entries; + struct ebt_counter * counters; + char * entries; }; struct ebt_replace_kernel { char name[EBT_TABLE_MAXNAMELEN]; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h index 14a65adc..5179be40 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h @@ -112,7 +112,7 @@ struct ipt_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ipt_entry entries[]; }; struct ipt_get_entries { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h index 22071db8..8c4ec88a 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h @@ -132,7 +132,7 @@ struct ip6t_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ip6t_entry entries[]; }; struct ip6t_get_entries { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/nfs4_mount.h b/sysroots/i686-unknown-linux-musl/include/linux/nfs4_mount.h index 0f794dd0..9b9c9f8a 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/nfs4_mount.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/nfs4_mount.h @@ -21,7 +21,7 @@ #define NFS4_MOUNT_VERSION 1 struct nfs_string { unsigned int len; - const char __user * data; + const char * data; }; struct nfs4_mount_data { int version; @@ -38,10 +38,10 @@ struct nfs4_mount_data { struct nfs_string mnt_path; struct nfs_string hostname; unsigned int host_addrlen; - struct sockaddr __user * host_addr; + struct sockaddr * host_addr; int proto; int auth_flavourlen; - int __user * auth_flavours; + int * auth_flavours; }; #define NFS4_MOUNT_SOFT 0x0001 #define NFS4_MOUNT_INTR 0x0002 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/omap3isp.h b/sysroots/i686-unknown-linux-musl/include/linux/omap3isp.h index 53345e3f..18346587 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/omap3isp.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/omap3isp.h @@ -88,7 +88,7 @@ struct omap3isp_h3a_aewb_config { }; struct omap3isp_stat_data { struct timeval ts; - void __user * buf; + void * buf; __struct_group(, frame,, __u32 buf_size; __u16 frame_number; __u16 cur_frame; @@ -224,12 +224,12 @@ struct omap3isp_ccdc_update_config { __u16 update; __u16 flag; enum omap3isp_alaw_ipwidth alawip; - struct omap3isp_ccdc_bclamp __user * bclamp; - struct omap3isp_ccdc_blcomp __user * blcomp; - struct omap3isp_ccdc_fpc __user * fpc; - struct omap3isp_ccdc_lsc_config __user * lsc_cfg; - struct omap3isp_ccdc_culling __user * cull; - __u8 __user * lsc; + struct omap3isp_ccdc_bclamp * bclamp; + struct omap3isp_ccdc_blcomp * blcomp; + struct omap3isp_ccdc_fpc * fpc; + struct omap3isp_ccdc_lsc_config * lsc_cfg; + struct omap3isp_ccdc_culling * cull; + __u8 * lsc; }; #define OMAP3ISP_PREV_LUMAENH (1 << 0) #define OMAP3ISP_PREV_INVALAW (1 << 1) @@ -323,17 +323,17 @@ struct omap3isp_prev_update_config { __u32 update; __u32 flag; __u32 shading_shift; - struct omap3isp_prev_luma __user * luma; - struct omap3isp_prev_hmed __user * hmed; - struct omap3isp_prev_cfa __user * cfa; - struct omap3isp_prev_csup __user * csup; - struct omap3isp_prev_wbal __user * wbal; - struct omap3isp_prev_blkadj __user * blkadj; - struct omap3isp_prev_rgbtorgb __user * rgb2rgb; - struct omap3isp_prev_csc __user * csc; - struct omap3isp_prev_yclimit __user * yclimit; - struct omap3isp_prev_dcor __user * dcor; - struct omap3isp_prev_nf __user * nf; - struct omap3isp_prev_gtables __user * gamma; + struct omap3isp_prev_luma * luma; + struct omap3isp_prev_hmed * hmed; + struct omap3isp_prev_cfa * cfa; + struct omap3isp_prev_csup * csup; + struct omap3isp_prev_wbal * wbal; + struct omap3isp_prev_blkadj * blkadj; + struct omap3isp_prev_rgbtorgb * rgb2rgb; + struct omap3isp_prev_csc * csc; + struct omap3isp_prev_yclimit * yclimit; + struct omap3isp_prev_dcor * dcor; + struct omap3isp_prev_nf * nf; + struct omap3isp_prev_gtables * gamma; }; #endif diff --git a/sysroots/i686-unknown-linux-musl/include/linux/omapfb.h b/sysroots/i686-unknown-linux-musl/include/linux/omapfb.h index 6ebec085..632e4689 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/omapfb.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/omapfb.h @@ -153,7 +153,7 @@ struct omapfb_memory_read { __u16 w; __u16 h; size_t buffer_size; - void __user * buffer; + void * buffer; }; struct omapfb_ovl_colormode { __u8 overlay_idx; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/ppp-ioctl.h b/sysroots/i686-unknown-linux-musl/include/linux/ppp-ioctl.h index 69c6e6d9..165d4477 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/ppp-ioctl.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/ppp-ioctl.h @@ -56,7 +56,7 @@ struct npioctl { enum NPmode mode; }; struct ppp_option_data { - __u8 __user * ptr; + __u8 * ptr; __u32 length; int transmit; }; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/route.h b/sysroots/i686-unknown-linux-musl/include/linux/route.h index 4ba6023d..f33327cc 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/route.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/route.h @@ -30,7 +30,7 @@ struct rtentry { unsigned long rt_pad3; void * rt_pad4; short rt_metric; - char __user * rt_dev; + char * rt_dev; unsigned long rt_mtu; #define rt_mss rt_mtu unsigned long rt_window; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/sem.h b/sysroots/i686-unknown-linux-musl/include/linux/sem.h index 98ed1bf3..c2f25e7d 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/sem.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/sem.h @@ -48,10 +48,10 @@ struct sembuf { }; union __kernel_legacy_semun { int val; - struct __kernel_legacy_semid_ds __user * buf; - unsigned short __user * array; - struct seminfo __user * __buf; - void __user * __pad; + struct __kernel_legacy_semid_ds * buf; + unsigned short * array; + struct seminfo * __buf; + void * __pad; }; struct seminfo { int semmap; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/sysctl.h b/sysroots/i686-unknown-linux-musl/include/linux/sysctl.h index ff17f7c5..5714323f 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/sysctl.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/sysctl.h @@ -23,11 +23,11 @@ #include <linux/compiler.h> #define CTL_MAXNAME 10 struct __sysctl_args { - int __user * name; + int * name; int nlen; - void __user * oldval; - size_t __user * oldlenp; - void __user * newval; + void * oldval; + size_t * oldlenp; + void * newval; size_t newlen; unsigned long __linux_unused[4]; }; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/time.h b/sysroots/i686-unknown-linux-musl/include/linux/time.h index df52295d..55d0e6e9 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/time.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/time.h @@ -18,14 +18,11 @@ ****************************************************************************/ #ifndef _UAPI_LINUX_TIME_H #define _UAPI_LINUX_TIME_H +#include <bits/timespec.h> #include <linux/types.h> #include <linux/time_types.h> #ifndef _STRUCT_TIMESPEC #define _STRUCT_TIMESPEC -struct timespec { - __kernel_old_time_t tv_sec; - long tv_nsec; -}; #endif struct timeval { __kernel_old_time_t tv_sec; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/uhid.h b/sysroots/i686-unknown-linux-musl/include/linux/uhid.h index 228ee503..1d471f84 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/uhid.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/uhid.h @@ -106,7 +106,7 @@ struct uhid_create_req { __u8 name[128]; __u8 phys[64]; __u8 uniq[64]; - __u8 __user * rd_data; + __u8 * rd_data; __u16 rd_size; __u16 bus; __u32 vendor; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/uio.h b/sysroots/i686-unknown-linux-musl/include/linux/uio.h index fa955cd0..04814c71 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/uio.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/uio.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct iovec { - void __user * iov_base; + void * iov_base; __kernel_size_t iov_len; }; #define UIO_FASTIOV 8 diff --git a/sysroots/i686-unknown-linux-musl/include/linux/usb/tmc.h b/sysroots/i686-unknown-linux-musl/include/linux/usb/tmc.h index 6d0add1e..b2672901 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/usb/tmc.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/usb/tmc.h @@ -46,7 +46,7 @@ struct usbtmc_request { } __attribute__((packed)); struct usbtmc_ctrlrequest { struct usbtmc_request req; - void __user * data; + void * data; } __attribute__((packed)); struct usbtmc_termchar { __u8 term_char; @@ -59,7 +59,7 @@ struct usbtmc_message { __u32 transfer_size; __u32 transferred; __u32 flags; - void __user * message; + void * message; } __attribute__((packed)); #define USBTMC_IOC_NR 91 #define USBTMC_IOCTL_INDICATOR_PULSE _IO(USBTMC_IOC_NR, 1) diff --git a/sysroots/i686-unknown-linux-musl/include/linux/usbdevice_fs.h b/sysroots/i686-unknown-linux-musl/include/linux/usbdevice_fs.h index 5fef522e..af8681b3 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/usbdevice_fs.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/usbdevice_fs.h @@ -27,13 +27,13 @@ struct usbdevfs_ctrltransfer { __u16 wIndex; __u16 wLength; __u32 timeout; - void __user * data; + void * data; }; struct usbdevfs_bulktransfer { unsigned int ep; unsigned int len; unsigned int timeout; - void __user * data; + void * data; }; struct usbdevfs_setinterface { unsigned int interface; @@ -41,7 +41,7 @@ struct usbdevfs_setinterface { }; struct usbdevfs_disconnectsignal { unsigned int signr; - void __user * context; + void * context; }; #define USBDEVFS_MAXDRIVERNAME 255 struct usbdevfs_getdriver { @@ -80,7 +80,7 @@ struct usbdevfs_urb { unsigned char endpoint; int status; unsigned int flags; - void __user * buffer; + void * buffer; int buffer_length; int actual_length; int start_frame; @@ -90,13 +90,13 @@ struct usbdevfs_urb { }; int error_count; unsigned int signr; - void __user * usercontext; + void * usercontext; struct usbdevfs_iso_packet_desc iso_frame_desc[]; }; struct usbdevfs_ioctl { int ifno; int ioctl_code; - void __user * data; + void * data; }; struct usbdevfs_hub_portinfo { char nports; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/uvcvideo.h b/sysroots/i686-unknown-linux-musl/include/linux/uvcvideo.h index 46528a93..f15ed784 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/uvcvideo.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/uvcvideo.h @@ -49,7 +49,7 @@ struct uvc_xu_control_mapping { __u8 offset; __u32 v4l2_type; __u32 data_type; - struct uvc_menu_info __user * menu_info; + struct uvc_menu_info * menu_info; __u32 menu_count; __u32 reserved[4]; }; @@ -58,7 +58,7 @@ struct uvc_xu_control_query { __u8 selector; __u8 query; __u16 size; - __u8 __user * data; + __u8 * data; }; #define UVCIOC_CTRL_MAP _IOWR('u', 0x20, struct uvc_xu_control_mapping) #define UVCIOC_CTRL_QUERY _IOWR('u', 0x21, struct uvc_xu_control_query) diff --git a/sysroots/i686-unknown-linux-musl/include/linux/vfio.h b/sysroots/i686-unknown-linux-musl/include/linux/vfio.h index 7dc3440f..3c1821c2 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/vfio.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/vfio.h @@ -390,7 +390,7 @@ struct vfio_iommu_type1_dma_map { struct vfio_bitmap { __u64 pgsize; __u64 size; - __u64 __user * data; + __u64 * data; }; struct vfio_iommu_type1_dma_unmap { __u32 argsz; diff --git a/sysroots/i686-unknown-linux-musl/include/linux/videodev2.h b/sysroots/i686-unknown-linux-musl/include/linux/videodev2.h index d418fd20..4fb0a254 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/videodev2.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/videodev2.h @@ -650,7 +650,7 @@ struct v4l2_framebuffer { #define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip __user * next; + struct v4l2_clip * next; }; struct v4l2_window { struct v4l2_rect w; @@ -658,7 +658,7 @@ struct v4l2_window { __u32 chromakey; struct v4l2_clip * clips; __u32 clipcount; - void __user * bitmap; + void * bitmap; __u8 global_alpha; }; struct v4l2_captureparm { @@ -895,32 +895,32 @@ struct v4l2_ext_control { union { __s32 value; __s64 value64; - char __user * string; - __u8 __user * p_u8; - __u16 __user * p_u16; - __u32 __user * p_u32; - __u32 __user * p_s32; - __u32 __user * p_s64; - struct v4l2_area __user * p_area; - struct v4l2_ctrl_h264_sps __user * p_h264_sps; + char * string; + __u8 * p_u8; + __u16 * p_u16; + __u32 * p_u32; + __u32 * p_s32; + __u32 * p_s64; + struct v4l2_area * p_area; + struct v4l2_ctrl_h264_sps * p_h264_sps; struct v4l2_ctrl_h264_pps * p_h264_pps; - struct v4l2_ctrl_h264_scaling_matrix __user * p_h264_scaling_matrix; - struct v4l2_ctrl_h264_pred_weights __user * p_h264_pred_weights; - struct v4l2_ctrl_h264_slice_params __user * p_h264_slice_params; - struct v4l2_ctrl_h264_decode_params __user * p_h264_decode_params; - struct v4l2_ctrl_fwht_params __user * p_fwht_params; - struct v4l2_ctrl_vp8_frame __user * p_vp8_frame; - struct v4l2_ctrl_mpeg2_sequence __user * p_mpeg2_sequence; - struct v4l2_ctrl_mpeg2_picture __user * p_mpeg2_picture; - struct v4l2_ctrl_mpeg2_quantisation __user * p_mpeg2_quantisation; - struct v4l2_ctrl_vp9_compressed_hdr __user * p_vp9_compressed_hdr_probs; - struct v4l2_ctrl_vp9_frame __user * p_vp9_frame; - struct v4l2_ctrl_hevc_sps __user * p_hevc_sps; - struct v4l2_ctrl_hevc_pps __user * p_hevc_pps; - struct v4l2_ctrl_hevc_slice_params __user * p_hevc_slice_params; - struct v4l2_ctrl_hevc_scaling_matrix __user * p_hevc_scaling_matrix; - struct v4l2_ctrl_hevc_decode_params __user * p_hevc_decode_params; - void __user * ptr; + struct v4l2_ctrl_h264_scaling_matrix * p_h264_scaling_matrix; + struct v4l2_ctrl_h264_pred_weights * p_h264_pred_weights; + struct v4l2_ctrl_h264_slice_params * p_h264_slice_params; + struct v4l2_ctrl_h264_decode_params * p_h264_decode_params; + struct v4l2_ctrl_fwht_params * p_fwht_params; + struct v4l2_ctrl_vp8_frame * p_vp8_frame; + struct v4l2_ctrl_mpeg2_sequence * p_mpeg2_sequence; + struct v4l2_ctrl_mpeg2_picture * p_mpeg2_picture; + struct v4l2_ctrl_mpeg2_quantisation * p_mpeg2_quantisation; + struct v4l2_ctrl_vp9_compressed_hdr * p_vp9_compressed_hdr_probs; + struct v4l2_ctrl_vp9_frame * p_vp9_frame; + struct v4l2_ctrl_hevc_sps * p_hevc_sps; + struct v4l2_ctrl_hevc_pps * p_hevc_pps; + struct v4l2_ctrl_hevc_slice_params * p_hevc_slice_params; + struct v4l2_ctrl_hevc_scaling_matrix * p_hevc_scaling_matrix; + struct v4l2_ctrl_hevc_decode_params * p_hevc_decode_params; + void * ptr; }; } __attribute__((packed)); struct v4l2_ext_controls { diff --git a/sysroots/i686-unknown-linux-musl/include/linux/wireless.h b/sysroots/i686-unknown-linux-musl/include/linux/wireless.h index ca31dd23..eb57fff1 100644 --- a/sysroots/i686-unknown-linux-musl/include/linux/wireless.h +++ b/sysroots/i686-unknown-linux-musl/include/linux/wireless.h @@ -264,7 +264,7 @@ struct iw_param { __u16 flags; }; struct iw_point { - void __user * pointer; + void * pointer; __u16 length; __u16 flags; }; diff --git a/sysroots/i686-unknown-linux-musl/include/mtd/mtd-abi.h b/sysroots/i686-unknown-linux-musl/include/mtd/mtd-abi.h index 6e26cae8..aed2acc1 100644 --- a/sysroots/i686-unknown-linux-musl/include/mtd/mtd-abi.h +++ b/sysroots/i686-unknown-linux-musl/include/mtd/mtd-abi.h @@ -30,7 +30,7 @@ struct erase_info_user64 { struct mtd_oob_buf { __u32 start; __u32 length; - unsigned char __user * ptr; + unsigned char * ptr; }; struct mtd_oob_buf64 { __u64 start; diff --git a/sysroots/i686-unknown-linux-musl/include/scsi/sg.h b/sysroots/i686-unknown-linux-musl/include/scsi/sg.h index 6911b163..9ba6cd64 100644 --- a/sysroots/i686-unknown-linux-musl/include/scsi/sg.h +++ b/sysroots/i686-unknown-linux-musl/include/scsi/sg.h @@ -20,7 +20,7 @@ #define _SCSI_GENERIC_H #include <linux/compiler.h> typedef struct sg_iovec { - void __user * iov_base; + void * iov_base; size_t iov_len; } sg_iovec_t; typedef struct sg_io_hdr { @@ -30,13 +30,13 @@ typedef struct sg_io_hdr { unsigned char mx_sb_len; unsigned short iovec_count; unsigned int dxfer_len; - void __user * dxferp; - unsigned char __user * cmdp; - void __user * sbp; + void * dxferp; + unsigned char * cmdp; + void * sbp; unsigned int timeout; unsigned int flags; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned char status; unsigned char masked_status; unsigned char msg_status; @@ -96,7 +96,7 @@ typedef struct sg_req_info { char sg_io_owned; char problem; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned int duration; int unused; } sg_req_info_t; diff --git a/sysroots/i686-unknown-linux-musl/include/sound/asequencer.h b/sysroots/i686-unknown-linux-musl/include/sound/asequencer.h index 0076933a..01a50585 100644 --- a/sysroots/i686-unknown-linux-musl/include/sound/asequencer.h +++ b/sysroots/i686-unknown-linux-musl/include/sound/asequencer.h @@ -209,9 +209,9 @@ struct snd_seq_running_info { #define SNDRV_SEQ_CLIENT_DUMMY 14 #define SNDRV_SEQ_CLIENT_OSS 15 typedef int __bitwise snd_seq_client_type_t; -#define NO_CLIENT ((__force snd_seq_client_type_t) 0) -#define USER_CLIENT ((__force snd_seq_client_type_t) 1) -#define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) +#define NO_CLIENT (( snd_seq_client_type_t) 0) +#define USER_CLIENT (( snd_seq_client_type_t) 1) +#define KERNEL_CLIENT (( snd_seq_client_type_t) 2) #define SNDRV_SEQ_FILTER_BROADCAST (1U << 0) #define SNDRV_SEQ_FILTER_MULTICAST (1U << 1) #define SNDRV_SEQ_FILTER_BOUNCE (1U << 2) diff --git a/sysroots/i686-unknown-linux-musl/include/sound/asound.h b/sysroots/i686-unknown-linux-musl/include/sound/asound.h index 6e325e90..9c1a3ae7 100644 --- a/sysroots/i686-unknown-linux-musl/include/sound/asound.h +++ b/sysroots/i686-unknown-linux-musl/include/sound/asound.h @@ -96,7 +96,7 @@ struct snd_hwdep_dsp_status { struct snd_hwdep_dsp_image { unsigned int index; unsigned char name[64]; - unsigned char __user * image; + unsigned char * image; size_t length; unsigned long driver_data; }; @@ -125,64 +125,64 @@ enum { SNDRV_PCM_STREAM_LAST = SNDRV_PCM_STREAM_CAPTURE, }; typedef int __bitwise snd_pcm_access_t; -#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((__force snd_pcm_access_t) 0) -#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((__force snd_pcm_access_t) 1) -#define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((__force snd_pcm_access_t) 2) -#define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((__force snd_pcm_access_t) 3) -#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((__force snd_pcm_access_t) 4) +#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED (( snd_pcm_access_t) 0) +#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED (( snd_pcm_access_t) 1) +#define SNDRV_PCM_ACCESS_MMAP_COMPLEX (( snd_pcm_access_t) 2) +#define SNDRV_PCM_ACCESS_RW_INTERLEAVED (( snd_pcm_access_t) 3) +#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED (( snd_pcm_access_t) 4) #define SNDRV_PCM_ACCESS_LAST SNDRV_PCM_ACCESS_RW_NONINTERLEAVED typedef int __bitwise snd_pcm_format_t; -#define SNDRV_PCM_FORMAT_S8 ((__force snd_pcm_format_t) 0) -#define SNDRV_PCM_FORMAT_U8 ((__force snd_pcm_format_t) 1) -#define SNDRV_PCM_FORMAT_S16_LE ((__force snd_pcm_format_t) 2) -#define SNDRV_PCM_FORMAT_S16_BE ((__force snd_pcm_format_t) 3) -#define SNDRV_PCM_FORMAT_U16_LE ((__force snd_pcm_format_t) 4) -#define SNDRV_PCM_FORMAT_U16_BE ((__force snd_pcm_format_t) 5) -#define SNDRV_PCM_FORMAT_S24_LE ((__force snd_pcm_format_t) 6) -#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) -#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) -#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) -#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10) -#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11) -#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12) -#define SNDRV_PCM_FORMAT_U32_BE ((__force snd_pcm_format_t) 13) -#define SNDRV_PCM_FORMAT_FLOAT_LE ((__force snd_pcm_format_t) 14) -#define SNDRV_PCM_FORMAT_FLOAT_BE ((__force snd_pcm_format_t) 15) -#define SNDRV_PCM_FORMAT_FLOAT64_LE ((__force snd_pcm_format_t) 16) -#define SNDRV_PCM_FORMAT_FLOAT64_BE ((__force snd_pcm_format_t) 17) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((__force snd_pcm_format_t) 18) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((__force snd_pcm_format_t) 19) -#define SNDRV_PCM_FORMAT_MU_LAW ((__force snd_pcm_format_t) 20) -#define SNDRV_PCM_FORMAT_A_LAW ((__force snd_pcm_format_t) 21) -#define SNDRV_PCM_FORMAT_IMA_ADPCM ((__force snd_pcm_format_t) 22) -#define SNDRV_PCM_FORMAT_MPEG ((__force snd_pcm_format_t) 23) -#define SNDRV_PCM_FORMAT_GSM ((__force snd_pcm_format_t) 24) -#define SNDRV_PCM_FORMAT_S20_LE ((__force snd_pcm_format_t) 25) -#define SNDRV_PCM_FORMAT_S20_BE ((__force snd_pcm_format_t) 26) -#define SNDRV_PCM_FORMAT_U20_LE ((__force snd_pcm_format_t) 27) -#define SNDRV_PCM_FORMAT_U20_BE ((__force snd_pcm_format_t) 28) -#define SNDRV_PCM_FORMAT_SPECIAL ((__force snd_pcm_format_t) 31) -#define SNDRV_PCM_FORMAT_S24_3LE ((__force snd_pcm_format_t) 32) -#define SNDRV_PCM_FORMAT_S24_3BE ((__force snd_pcm_format_t) 33) -#define SNDRV_PCM_FORMAT_U24_3LE ((__force snd_pcm_format_t) 34) -#define SNDRV_PCM_FORMAT_U24_3BE ((__force snd_pcm_format_t) 35) -#define SNDRV_PCM_FORMAT_S20_3LE ((__force snd_pcm_format_t) 36) -#define SNDRV_PCM_FORMAT_S20_3BE ((__force snd_pcm_format_t) 37) -#define SNDRV_PCM_FORMAT_U20_3LE ((__force snd_pcm_format_t) 38) -#define SNDRV_PCM_FORMAT_U20_3BE ((__force snd_pcm_format_t) 39) -#define SNDRV_PCM_FORMAT_S18_3LE ((__force snd_pcm_format_t) 40) -#define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) -#define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) -#define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) -#define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) -#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) -#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) -#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) -#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) -#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) -#define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) -#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) -#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) +#define SNDRV_PCM_FORMAT_S8 (( snd_pcm_format_t) 0) +#define SNDRV_PCM_FORMAT_U8 (( snd_pcm_format_t) 1) +#define SNDRV_PCM_FORMAT_S16_LE (( snd_pcm_format_t) 2) +#define SNDRV_PCM_FORMAT_S16_BE (( snd_pcm_format_t) 3) +#define SNDRV_PCM_FORMAT_U16_LE (( snd_pcm_format_t) 4) +#define SNDRV_PCM_FORMAT_U16_BE (( snd_pcm_format_t) 5) +#define SNDRV_PCM_FORMAT_S24_LE (( snd_pcm_format_t) 6) +#define SNDRV_PCM_FORMAT_S24_BE (( snd_pcm_format_t) 7) +#define SNDRV_PCM_FORMAT_U24_LE (( snd_pcm_format_t) 8) +#define SNDRV_PCM_FORMAT_U24_BE (( snd_pcm_format_t) 9) +#define SNDRV_PCM_FORMAT_S32_LE (( snd_pcm_format_t) 10) +#define SNDRV_PCM_FORMAT_S32_BE (( snd_pcm_format_t) 11) +#define SNDRV_PCM_FORMAT_U32_LE (( snd_pcm_format_t) 12) +#define SNDRV_PCM_FORMAT_U32_BE (( snd_pcm_format_t) 13) +#define SNDRV_PCM_FORMAT_FLOAT_LE (( snd_pcm_format_t) 14) +#define SNDRV_PCM_FORMAT_FLOAT_BE (( snd_pcm_format_t) 15) +#define SNDRV_PCM_FORMAT_FLOAT64_LE (( snd_pcm_format_t) 16) +#define SNDRV_PCM_FORMAT_FLOAT64_BE (( snd_pcm_format_t) 17) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( snd_pcm_format_t) 18) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( snd_pcm_format_t) 19) +#define SNDRV_PCM_FORMAT_MU_LAW (( snd_pcm_format_t) 20) +#define SNDRV_PCM_FORMAT_A_LAW (( snd_pcm_format_t) 21) +#define SNDRV_PCM_FORMAT_IMA_ADPCM (( snd_pcm_format_t) 22) +#define SNDRV_PCM_FORMAT_MPEG (( snd_pcm_format_t) 23) +#define SNDRV_PCM_FORMAT_GSM (( snd_pcm_format_t) 24) +#define SNDRV_PCM_FORMAT_S20_LE (( snd_pcm_format_t) 25) +#define SNDRV_PCM_FORMAT_S20_BE (( snd_pcm_format_t) 26) +#define SNDRV_PCM_FORMAT_U20_LE (( snd_pcm_format_t) 27) +#define SNDRV_PCM_FORMAT_U20_BE (( snd_pcm_format_t) 28) +#define SNDRV_PCM_FORMAT_SPECIAL (( snd_pcm_format_t) 31) +#define SNDRV_PCM_FORMAT_S24_3LE (( snd_pcm_format_t) 32) +#define SNDRV_PCM_FORMAT_S24_3BE (( snd_pcm_format_t) 33) +#define SNDRV_PCM_FORMAT_U24_3LE (( snd_pcm_format_t) 34) +#define SNDRV_PCM_FORMAT_U24_3BE (( snd_pcm_format_t) 35) +#define SNDRV_PCM_FORMAT_S20_3LE (( snd_pcm_format_t) 36) +#define SNDRV_PCM_FORMAT_S20_3BE (( snd_pcm_format_t) 37) +#define SNDRV_PCM_FORMAT_U20_3LE (( snd_pcm_format_t) 38) +#define SNDRV_PCM_FORMAT_U20_3BE (( snd_pcm_format_t) 39) +#define SNDRV_PCM_FORMAT_S18_3LE (( snd_pcm_format_t) 40) +#define SNDRV_PCM_FORMAT_S18_3BE (( snd_pcm_format_t) 41) +#define SNDRV_PCM_FORMAT_U18_3LE (( snd_pcm_format_t) 42) +#define SNDRV_PCM_FORMAT_U18_3BE (( snd_pcm_format_t) 43) +#define SNDRV_PCM_FORMAT_G723_24 (( snd_pcm_format_t) 44) +#define SNDRV_PCM_FORMAT_G723_24_1B (( snd_pcm_format_t) 45) +#define SNDRV_PCM_FORMAT_G723_40 (( snd_pcm_format_t) 46) +#define SNDRV_PCM_FORMAT_G723_40_1B (( snd_pcm_format_t) 47) +#define SNDRV_PCM_FORMAT_DSD_U8 (( snd_pcm_format_t) 48) +#define SNDRV_PCM_FORMAT_DSD_U16_LE (( snd_pcm_format_t) 49) +#define SNDRV_PCM_FORMAT_DSD_U32_LE (( snd_pcm_format_t) 50) +#define SNDRV_PCM_FORMAT_DSD_U16_BE (( snd_pcm_format_t) 51) +#define SNDRV_PCM_FORMAT_DSD_U32_BE (( snd_pcm_format_t) 52) #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE #define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8 #ifdef SNDRV_LITTLE_ENDIAN @@ -212,7 +212,7 @@ typedef int __bitwise snd_pcm_format_t; #define SNDRV_PCM_FORMAT_U20 SNDRV_PCM_FORMAT_U20_BE #endif typedef int __bitwise snd_pcm_subformat_t; -#define SNDRV_PCM_SUBFORMAT_STD ((__force snd_pcm_subformat_t) 0) +#define SNDRV_PCM_SUBFORMAT_STD (( snd_pcm_subformat_t) 0) #define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD #define SNDRV_PCM_INFO_MMAP 0x00000001 #define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 @@ -243,15 +243,15 @@ typedef int __bitwise snd_pcm_subformat_t; #define __SND_STRUCT_TIME64 #endif typedef int __bitwise snd_pcm_state_t; -#define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) -#define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) -#define SNDRV_PCM_STATE_PREPARED ((__force snd_pcm_state_t) 2) -#define SNDRV_PCM_STATE_RUNNING ((__force snd_pcm_state_t) 3) -#define SNDRV_PCM_STATE_XRUN ((__force snd_pcm_state_t) 4) -#define SNDRV_PCM_STATE_DRAINING ((__force snd_pcm_state_t) 5) -#define SNDRV_PCM_STATE_PAUSED ((__force snd_pcm_state_t) 6) -#define SNDRV_PCM_STATE_SUSPENDED ((__force snd_pcm_state_t) 7) -#define SNDRV_PCM_STATE_DISCONNECTED ((__force snd_pcm_state_t) 8) +#define SNDRV_PCM_STATE_OPEN (( snd_pcm_state_t) 0) +#define SNDRV_PCM_STATE_SETUP (( snd_pcm_state_t) 1) +#define SNDRV_PCM_STATE_PREPARED (( snd_pcm_state_t) 2) +#define SNDRV_PCM_STATE_RUNNING (( snd_pcm_state_t) 3) +#define SNDRV_PCM_STATE_XRUN (( snd_pcm_state_t) 4) +#define SNDRV_PCM_STATE_DRAINING (( snd_pcm_state_t) 5) +#define SNDRV_PCM_STATE_PAUSED (( snd_pcm_state_t) 6) +#define SNDRV_PCM_STATE_SUSPENDED (( snd_pcm_state_t) 7) +#define SNDRV_PCM_STATE_DISCONNECTED (( snd_pcm_state_t) 8) #define SNDRV_PCM_STATE_LAST SNDRV_PCM_STATE_DISCONNECTED enum { SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000, @@ -475,12 +475,12 @@ struct __snd_pcm_sync_ptr64 { }; struct snd_xferi { snd_pcm_sframes_t result; - void __user * buf; + void * buf; snd_pcm_uframes_t frames; }; struct snd_xfern { snd_pcm_sframes_t result; - void __user * __user * bufs; + void * * bufs; snd_pcm_uframes_t frames; }; enum { @@ -776,22 +776,22 @@ struct snd_ctl_card_info { unsigned char components[128]; }; typedef int __bitwise snd_ctl_elem_type_t; -#define SNDRV_CTL_ELEM_TYPE_NONE ((__force snd_ctl_elem_type_t) 0) -#define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((__force snd_ctl_elem_type_t) 1) -#define SNDRV_CTL_ELEM_TYPE_INTEGER ((__force snd_ctl_elem_type_t) 2) -#define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((__force snd_ctl_elem_type_t) 3) -#define SNDRV_CTL_ELEM_TYPE_BYTES ((__force snd_ctl_elem_type_t) 4) -#define SNDRV_CTL_ELEM_TYPE_IEC958 ((__force snd_ctl_elem_type_t) 5) -#define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((__force snd_ctl_elem_type_t) 6) +#define SNDRV_CTL_ELEM_TYPE_NONE (( snd_ctl_elem_type_t) 0) +#define SNDRV_CTL_ELEM_TYPE_BOOLEAN (( snd_ctl_elem_type_t) 1) +#define SNDRV_CTL_ELEM_TYPE_INTEGER (( snd_ctl_elem_type_t) 2) +#define SNDRV_CTL_ELEM_TYPE_ENUMERATED (( snd_ctl_elem_type_t) 3) +#define SNDRV_CTL_ELEM_TYPE_BYTES (( snd_ctl_elem_type_t) 4) +#define SNDRV_CTL_ELEM_TYPE_IEC958 (( snd_ctl_elem_type_t) 5) +#define SNDRV_CTL_ELEM_TYPE_INTEGER64 (( snd_ctl_elem_type_t) 6) #define SNDRV_CTL_ELEM_TYPE_LAST SNDRV_CTL_ELEM_TYPE_INTEGER64 typedef int __bitwise snd_ctl_elem_iface_t; -#define SNDRV_CTL_ELEM_IFACE_CARD ((__force snd_ctl_elem_iface_t) 0) -#define SNDRV_CTL_ELEM_IFACE_HWDEP ((__force snd_ctl_elem_iface_t) 1) -#define SNDRV_CTL_ELEM_IFACE_MIXER ((__force snd_ctl_elem_iface_t) 2) -#define SNDRV_CTL_ELEM_IFACE_PCM ((__force snd_ctl_elem_iface_t) 3) -#define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((__force snd_ctl_elem_iface_t) 4) -#define SNDRV_CTL_ELEM_IFACE_TIMER ((__force snd_ctl_elem_iface_t) 5) -#define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((__force snd_ctl_elem_iface_t) 6) +#define SNDRV_CTL_ELEM_IFACE_CARD (( snd_ctl_elem_iface_t) 0) +#define SNDRV_CTL_ELEM_IFACE_HWDEP (( snd_ctl_elem_iface_t) 1) +#define SNDRV_CTL_ELEM_IFACE_MIXER (( snd_ctl_elem_iface_t) 2) +#define SNDRV_CTL_ELEM_IFACE_PCM (( snd_ctl_elem_iface_t) 3) +#define SNDRV_CTL_ELEM_IFACE_RAWMIDI (( snd_ctl_elem_iface_t) 4) +#define SNDRV_CTL_ELEM_IFACE_TIMER (( snd_ctl_elem_iface_t) 5) +#define SNDRV_CTL_ELEM_IFACE_SEQUENCER (( snd_ctl_elem_iface_t) 6) #define SNDRV_CTL_ELEM_IFACE_LAST SNDRV_CTL_ELEM_IFACE_SEQUENCER #define SNDRV_CTL_ELEM_ACCESS_READ (1 << 0) #define SNDRV_CTL_ELEM_ACCESS_WRITE (1 << 1) @@ -826,7 +826,7 @@ struct snd_ctl_elem_list { unsigned int space; unsigned int used; unsigned int count; - struct snd_ctl_elem_id __user * pids; + struct snd_ctl_elem_id * pids; unsigned char reserved[50]; }; struct snd_ctl_elem_info { diff --git a/sysroots/i686-unknown-linux-musl/include/xen/gntdev.h b/sysroots/i686-unknown-linux-musl/include/xen/gntdev.h index 1e78ac37..eada73c4 100644 --- a/sysroots/i686-unknown-linux-musl/include/xen/gntdev.h +++ b/sysroots/i686-unknown-linux-musl/include/xen/gntdev.h @@ -55,7 +55,7 @@ struct ioctl_gntdev_unmap_notify { }; struct gntdev_grant_copy_segment { union { - void __user * virt; + void * virt; struct { grant_ref_t ref; __u16 offset; @@ -69,7 +69,7 @@ struct gntdev_grant_copy_segment { #define IOCTL_GNTDEV_GRANT_COPY _IOC(_IOC_NONE, 'G', 8, sizeof(struct ioctl_gntdev_grant_copy)) struct ioctl_gntdev_grant_copy { unsigned int count; - struct gntdev_grant_copy_segment __user * segments; + struct gntdev_grant_copy_segment * segments; }; #define UNMAP_NOTIFY_CLEAR_BYTE 0x1 #define UNMAP_NOTIFY_SEND_EVENT 0x2 diff --git a/sysroots/i686-unknown-linux-musl/include/xen/privcmd.h b/sysroots/i686-unknown-linux-musl/include/xen/privcmd.h index 145446b4..21d9f840 100644 --- a/sysroots/i686-unknown-linux-musl/include/xen/privcmd.h +++ b/sysroots/i686-unknown-linux-musl/include/xen/privcmd.h @@ -33,13 +33,13 @@ struct privcmd_mmap_entry { struct privcmd_mmap { int num; domid_t dom; - struct privcmd_mmap_entry __user * entry; + struct privcmd_mmap_entry * entry; }; struct privcmd_mmapbatch { int num; domid_t dom; __u64 addr; - xen_pfn_t __user * arr; + xen_pfn_t * arr; }; #define PRIVCMD_MMAPBATCH_MFN_ERROR 0xf0000000U #define PRIVCMD_MMAPBATCH_PAGED_ERROR 0x80000000U @@ -47,17 +47,17 @@ struct privcmd_mmapbatch_v2 { unsigned int num; domid_t dom; __u64 addr; - const xen_pfn_t __user * arr; - int __user * err; + const xen_pfn_t * arr; + int * err; }; struct privcmd_dm_op_buf { - void __user * uptr; + void * uptr; size_t size; }; struct privcmd_dm_op { domid_t dom; __u16 num; - const struct privcmd_dm_op_buf __user * ubufs; + const struct privcmd_dm_op_buf * ubufs; }; struct privcmd_mmap_resource { domid_t dom; diff --git a/sysroots/i686-unknown-linux-musl/lib/crt1.o b/sysroots/i686-unknown-linux-musl/lib/crt1.o Binary files differindex 87401ad4..dda5f1c1 100644 --- a/sysroots/i686-unknown-linux-musl/lib/crt1.o +++ b/sysroots/i686-unknown-linux-musl/lib/crt1.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crtbegin.o b/sysroots/i686-unknown-linux-musl/lib/crtbegin.o Binary files differindex 405d5987..8dbd3525 100755 --- a/sysroots/i686-unknown-linux-musl/lib/crtbegin.o +++ b/sysroots/i686-unknown-linux-musl/lib/crtbegin.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crtbeginS.o b/sysroots/i686-unknown-linux-musl/lib/crtbeginS.o Binary files differindex 405d5987..8dbd3525 100755 --- a/sysroots/i686-unknown-linux-musl/lib/crtbeginS.o +++ b/sysroots/i686-unknown-linux-musl/lib/crtbeginS.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crtbeginT.o b/sysroots/i686-unknown-linux-musl/lib/crtbeginT.o Binary files differindex 405d5987..8dbd3525 100755 --- a/sysroots/i686-unknown-linux-musl/lib/crtbeginT.o +++ b/sysroots/i686-unknown-linux-musl/lib/crtbeginT.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crtend.o b/sysroots/i686-unknown-linux-musl/lib/crtend.o Binary files differindex fd538f37..b52f4bef 100755 --- a/sysroots/i686-unknown-linux-musl/lib/crtend.o +++ b/sysroots/i686-unknown-linux-musl/lib/crtend.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crtendS.o b/sysroots/i686-unknown-linux-musl/lib/crtendS.o Binary files differindex fd538f37..b52f4bef 100755 --- a/sysroots/i686-unknown-linux-musl/lib/crtendS.o +++ b/sysroots/i686-unknown-linux-musl/lib/crtendS.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crti.o b/sysroots/i686-unknown-linux-musl/lib/crti.o Binary files differindex 0f3e636d..6af73227 100644 --- a/sysroots/i686-unknown-linux-musl/lib/crti.o +++ b/sysroots/i686-unknown-linux-musl/lib/crti.o diff --git a/sysroots/i686-unknown-linux-musl/lib/crtn.o b/sysroots/i686-unknown-linux-musl/lib/crtn.o Binary files differindex 4a54eead..8caede41 100644 --- a/sysroots/i686-unknown-linux-musl/lib/crtn.o +++ b/sysroots/i686-unknown-linux-musl/lib/crtn.o diff --git a/sysroots/i686-unknown-linux-musl/lib/libc++.a b/sysroots/i686-unknown-linux-musl/lib/libc++.a Binary files differindex 5c104e20..a3deb9e9 100644 --- a/sysroots/i686-unknown-linux-musl/lib/libc++.a +++ b/sysroots/i686-unknown-linux-musl/lib/libc++.a diff --git a/sysroots/i686-unknown-linux-musl/lib/libc++.so b/sysroots/i686-unknown-linux-musl/lib/libc++.so Binary files differindex a2449bc9..b073a29d 100755 --- a/sysroots/i686-unknown-linux-musl/lib/libc++.so +++ b/sysroots/i686-unknown-linux-musl/lib/libc++.so diff --git a/sysroots/i686-unknown-linux-musl/lib/libc++abi.a b/sysroots/i686-unknown-linux-musl/lib/libc++abi.a Binary files differindex 00b54d46..9ac2ccbb 100644 --- a/sysroots/i686-unknown-linux-musl/lib/libc++abi.a +++ b/sysroots/i686-unknown-linux-musl/lib/libc++abi.a diff --git a/sysroots/i686-unknown-linux-musl/lib/libc.a b/sysroots/i686-unknown-linux-musl/lib/libc.a Binary files differindex 91746a1e..b9a92caa 100644 --- a/sysroots/i686-unknown-linux-musl/lib/libc.a +++ b/sysroots/i686-unknown-linux-musl/lib/libc.a diff --git a/sysroots/i686-unknown-linux-musl/lib/libc_musl.so b/sysroots/i686-unknown-linux-musl/lib/libc_musl.so Binary files differindex 6b167b70..99c6229a 100755 --- a/sysroots/i686-unknown-linux-musl/lib/libc_musl.so +++ b/sysroots/i686-unknown-linux-musl/lib/libc_musl.so diff --git a/sysroots/i686-unknown-linux-musl/lib/libc_musl_linker_object.o b/sysroots/i686-unknown-linux-musl/lib/libc_musl_linker_object.o Binary files differindex 82ccd816..b1263bb2 100644 --- a/sysroots/i686-unknown-linux-musl/lib/libc_musl_linker_object.o +++ b/sysroots/i686-unknown-linux-musl/lib/libc_musl_linker_object.o diff --git a/sysroots/i686-unknown-linux-musl/lib/libz.a b/sysroots/i686-unknown-linux-musl/lib/libz.a Binary files differindex c23368a1..15717454 100644 --- a/sysroots/i686-unknown-linux-musl/lib/libz.a +++ b/sysroots/i686-unknown-linux-musl/lib/libz.a diff --git a/sysroots/i686-unknown-linux-musl/lib/rcrt1.o b/sysroots/i686-unknown-linux-musl/lib/rcrt1.o Binary files differindex 4a6a2268..7be009d2 100644 --- a/sysroots/i686-unknown-linux-musl/lib/rcrt1.o +++ b/sysroots/i686-unknown-linux-musl/lib/rcrt1.o diff --git a/sysroots/x86_64-unknown-linux-musl/NOTICE.bionic b/sysroots/x86_64-unknown-linux-musl/NOTICE.bionic index 9d555923..4d3a1086 100644 --- a/sysroots/x86_64-unknown-linux-musl/NOTICE.bionic +++ b/sysroots/x86_64-unknown-linux-musl/NOTICE.bionic @@ -894,6 +894,34 @@ SUCH DAMAGE. ------------------------------------------------------------------- +Copyright (C) 2023 The Android Open Source Project +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +------------------------------------------------------------------- + Copyright (c) 1980, 1983, 1988, 1993 The Regents of the University of California. All rights reserved. diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-arm/asm/signal.h b/sysroots/x86_64-unknown-linux-musl/include/asm-arm/asm/signal.h index 04243808..90cb8d6a 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-arm/asm/signal.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-arm/asm/signal.h @@ -76,7 +76,7 @@ struct sigaction { #define sa_handler _u._sa_handler #define sa_sigaction _u._sa_sigaction typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-arm64/asm/kvm.h b/sysroots/x86_64-unknown-linux-musl/include/asm-arm64/asm/kvm.h index ecc2e011..ce0c3188 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-arm64/asm/kvm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-arm64/asm/kvm.h @@ -121,7 +121,7 @@ struct kvm_vcpu_events { struct kvm_arm_copy_mte_tags { __u64 guest_ipa; __u64 length; - void __user * addr; + void * addr; __u64 flags; __u64 reserved[2]; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/poll.h b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/poll.h index 372bc773..ba6f2e9e 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/poll.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/poll.h @@ -41,8 +41,8 @@ #ifndef POLLRDHUP #define POLLRDHUP 0x2000 #endif -#define POLLFREE (__force __poll_t) 0x4000 -#define POLL_BUSY_LOOP (__force __poll_t) 0x8000 +#define POLLFREE ( __poll_t) 0x4000 +#define POLL_BUSY_LOOP ( __poll_t) 0x8000 struct pollfd { int fd; short events; diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/siginfo.h b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/siginfo.h index c5e4178b..90393bab 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/siginfo.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/siginfo.h @@ -22,7 +22,7 @@ #include <linux/types.h> typedef union sigval { int sival_int; - void __user * sival_ptr; + void * sival_ptr; } sigval_t; #define SI_MAX_SIZE 128 #ifndef __ARCH_SI_BAND_T @@ -58,7 +58,7 @@ union __sifields { __ARCH_SI_CLOCK_T _stime; } _sigchld; struct { - void __user * _addr; + void * _addr; #ifdef __ia64__ int _imm; unsigned int _flags; @@ -70,8 +70,8 @@ union __sifields { short _addr_lsb; struct { char _dummy_bnd[__ADDR_BND_PKEY_PAD]; - void __user * _lower; - void __user * _upper; + void * _lower; + void * _upper; } _addr_bnd; struct { char _dummy_pkey[__ADDR_BND_PKEY_PAD]; @@ -89,7 +89,7 @@ union __sifields { int _fd; } _sigpoll; struct { - void __user * _call_addr; + void * _call_addr; int _syscall; unsigned int _arch; } _sigsys; diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal-defs.h b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal-defs.h index c7e95040..dea8fbca 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal-defs.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal-defs.h @@ -55,11 +55,11 @@ #endif #ifndef __ASSEMBLY__ typedef void __signalfn_t(int); -typedef __signalfn_t __user * __sighandler_t; +typedef __signalfn_t * __sighandler_t; typedef void __restorefn_t(void); -typedef __restorefn_t __user * __sigrestore_t; -#define SIG_DFL ((__force __sighandler_t) 0) -#define SIG_IGN ((__force __sighandler_t) 1) -#define SIG_ERR ((__force __sighandler_t) - 1) +typedef __restorefn_t * __sigrestore_t; +#define SIG_DFL (( __sighandler_t) 0) +#define SIG_IGN (( __sighandler_t) 1) +#define SIG_ERR (( __sighandler_t) - 1) #endif #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal.h b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal.h index 5cb1dce4..9cf393ff 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-generic/signal.h @@ -82,7 +82,7 @@ struct sigaction { sigset_t sa_mask; }; typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h b/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h index 7d5b4d4d..c7909505 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/sigcontext.h @@ -180,7 +180,7 @@ struct sigcontext { __u32 eflags; __u32 esp_at_signal; __u16 ss, __ssh; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; __u32 oldmask; __u32 cr2; }; @@ -215,7 +215,7 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; #ifdef __ILP32__ __u32 __fpstate_pad; #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/signal.h b/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/signal.h index cbeeac46..37dce50d 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/signal.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm-x86/asm/signal.h @@ -88,7 +88,7 @@ struct sigaction { }; #endif typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm/sigcontext.h b/sysroots/x86_64-unknown-linux-musl/include/asm/sigcontext.h index 7d5b4d4d..c7909505 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm/sigcontext.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm/sigcontext.h @@ -180,7 +180,7 @@ struct sigcontext { __u32 eflags; __u32 esp_at_signal; __u16 ss, __ssh; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; __u32 oldmask; __u32 cr2; }; @@ -215,7 +215,7 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user * fpstate; + struct _fpstate * fpstate; #ifdef __ILP32__ __u32 __fpstate_pad; #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/asm/signal.h b/sysroots/x86_64-unknown-linux-musl/include/asm/signal.h index cbeeac46..37dce50d 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/asm/signal.h +++ b/sysroots/x86_64-unknown-linux-musl/include/asm/signal.h @@ -88,7 +88,7 @@ struct sigaction { }; #endif typedef struct sigaltstack { - void __user * ss_sp; + void * ss_sp; int ss_flags; __kernel_size_t ss_size; } stack_t; diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/drm.h index 878e899e..19544525 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/drm.h @@ -78,19 +78,19 @@ struct drm_version { int version_minor; int version_patchlevel; __kernel_size_t name_len; - char __user * name; + char * name; __kernel_size_t date_len; - char __user * date; + char * date; __kernel_size_t desc_len; - char __user * desc; + char * desc; }; struct drm_unique { __kernel_size_t unique_len; - char __user * unique; + char * unique; }; struct drm_list { int count; - struct drm_version __user * version; + struct drm_version * version; }; struct drm_block { int unused; @@ -202,37 +202,37 @@ struct drm_buf_desc { }; struct drm_buf_info { int count; - struct drm_buf_desc __user * list; + struct drm_buf_desc * list; }; struct drm_buf_free { int count; - int __user * list; + int * list; }; struct drm_buf_pub { int idx; int total; int used; - void __user * address; + void * address; }; struct drm_buf_map { int count; #ifdef __cplusplus - void __user * virt; + void * virt; #else - void __user * __linux_virtual; + void * __linux_virtual; #endif - struct drm_buf_pub __user * list; + struct drm_buf_pub * list; }; struct drm_dma { int context; int send_count; - int __user * send_indices; - int __user * send_sizes; + int * send_indices; + int * send_sizes; enum drm_dma_flags flags; int request_count; int request_size; - int __user * request_indices; - int __user * request_sizes; + int * request_indices; + int * request_sizes; int granted_count; }; enum drm_ctx_flags { @@ -245,7 +245,7 @@ struct drm_ctx { }; struct drm_ctx_res { int count; - struct drm_ctx __user * contexts; + struct drm_ctx * contexts; }; struct drm_draw { drm_drawable_t handle; diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/i915_drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/i915_drm.h index a8982bf5..794e7849 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/i915_drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/i915_drm.h @@ -287,18 +287,18 @@ typedef struct drm_i915_batchbuffer { int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_batchbuffer_t; typedef struct _drm_i915_cmdbuffer { - char __user * buf; + char * buf; int sz; int DR1; int DR4; int num_cliprects; - struct drm_clip_rect __user * cliprects; + struct drm_clip_rect * cliprects; } drm_i915_cmdbuffer_t; typedef struct drm_i915_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_i915_irq_emit_t; typedef struct drm_i915_irq_wait { int irq_seq; @@ -371,7 +371,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_OA_TIMESTAMP_FREQUENCY 57 struct drm_i915_getparam { __s32 param; - int __user * value; + int * value; }; typedef struct drm_i915_getparam drm_i915_getparam_t; #define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1 @@ -387,7 +387,7 @@ typedef struct drm_i915_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_i915_mem_alloc_t; typedef struct drm_i915_mem_free { int region; diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/mga_drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/mga_drm.h index dc62961d..eb55fa7c 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/mga_drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/mga_drm.h @@ -239,7 +239,7 @@ typedef struct _drm_mga_blit { #define MGA_PARAM_CARD_TYPE 2 typedef struct drm_mga_getparam { int param; - void __user * value; + void * value; } drm_mga_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/r128_drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/r128_drm.h index 618b6dca..3e013b17 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/r128_drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/r128_drm.h @@ -204,13 +204,13 @@ typedef struct drm_r128_depth { R128_READ_PIXELS = 0x04 } func; int n; - int __user * x; - int __user * y; - unsigned int __user * buffer; - unsigned char __user * mask; + int * x; + int * y; + unsigned int * buffer; + unsigned char * mask; } drm_r128_depth_t; typedef struct drm_r128_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_r128_stipple_t; typedef struct drm_r128_indirect { int idx; @@ -227,7 +227,7 @@ typedef struct drm_r128_fullscreen { #define R128_PARAM_IRQ_NR 1 typedef struct drm_r128_getparam { int param; - void __user * value; + void * value; } drm_r128_getparam_t; #ifdef __cplusplus } diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/radeon_drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/radeon_drm.h index 9dc69ad5..3ec6bb3f 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/radeon_drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/radeon_drm.h @@ -479,7 +479,7 @@ typedef struct drm_radeon_clear { unsigned int clear_depth; unsigned int color_mask; unsigned int depth_mask; - drm_radeon_clear_rect_t __user * depth_boxes; + drm_radeon_clear_rect_t * depth_boxes; } drm_radeon_clear_t; typedef struct drm_radeon_vertex { int prim; @@ -498,20 +498,20 @@ typedef struct drm_radeon_vertex2 { int idx; int discard; int nr_states; - drm_radeon_state_t __user * state; + drm_radeon_state_t * state; int nr_prims; - drm_radeon_prim_t __user * prim; + drm_radeon_prim_t * prim; } drm_radeon_vertex2_t; typedef struct drm_radeon_cmd_buffer { int bufsz; - char __user * buf; + char * buf; int nbox; - struct drm_clip_rect __user * boxes; + struct drm_clip_rect * boxes; } drm_radeon_cmd_buffer_t; typedef struct drm_radeon_tex_image { unsigned int x, y; unsigned int width, height; - const void __user * data; + const void * data; } drm_radeon_tex_image_t; typedef struct drm_radeon_texture { unsigned int offset; @@ -519,10 +519,10 @@ typedef struct drm_radeon_texture { int format; int width; int height; - drm_radeon_tex_image_t __user * image; + drm_radeon_tex_image_t * image; } drm_radeon_texture_t; typedef struct drm_radeon_stipple { - unsigned int __user * mask; + unsigned int * mask; } drm_radeon_stipple_t; typedef struct drm_radeon_indirect { int idx; @@ -552,7 +552,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_NUM_Z_PIPES 17 typedef struct drm_radeon_getparam { int param; - void __user * value; + void * value; } drm_radeon_getparam_t; #define RADEON_MEM_REGION_GART 1 #define RADEON_MEM_REGION_FB 2 @@ -560,7 +560,7 @@ typedef struct drm_radeon_mem_alloc { int region; int alignment; int size; - int __user * region_offset; + int * region_offset; } drm_radeon_mem_alloc_t; typedef struct drm_radeon_mem_free { int region; @@ -572,7 +572,7 @@ typedef struct drm_radeon_mem_init_heap { int start; } drm_radeon_mem_init_heap_t; typedef struct drm_radeon_irq_emit { - int __user * irq_seq; + int * irq_seq; } drm_radeon_irq_emit_t; typedef struct drm_radeon_irq_wait { int irq_seq; diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/savage_drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/savage_drm.h index ae87d21b..efc0ae6b 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/savage_drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/savage_drm.h @@ -68,14 +68,14 @@ typedef struct drm_savage_init { } drm_savage_init_t; typedef union drm_savage_cmd_header drm_savage_cmd_header_t; typedef struct drm_savage_cmdbuf { - drm_savage_cmd_header_t __user * cmd_addr; + drm_savage_cmd_header_t * cmd_addr; unsigned int size; unsigned int dma_idx; int discard; - unsigned int __user * vb_addr; + unsigned int * vb_addr; unsigned int vb_size; unsigned int vb_stride; - struct drm_clip_rect __user * box_addr; + struct drm_clip_rect * box_addr; unsigned int nbox; } drm_savage_cmdbuf_t; #define SAVAGE_WAIT_2D 0x1 diff --git a/sysroots/x86_64-unknown-linux-musl/include/drm/via_drm.h b/sysroots/x86_64-unknown-linux-musl/include/drm/via_drm.h index 9ef645a1..95a149b6 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/drm/via_drm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/drm/via_drm.h @@ -125,7 +125,7 @@ typedef struct _drm_via_dma_init { unsigned long reg_pause_addr; } drm_via_dma_init_t; typedef struct _drm_via_cmdbuffer { - char __user * buf; + char * buf; unsigned long size; } drm_via_cmdbuffer_t; typedef struct _drm_via_tex_region { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/atm.h b/sysroots/x86_64-unknown-linux-musl/include/linux/atm.h index 488fa05a..72d329df 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/atm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/atm.h @@ -140,7 +140,7 @@ struct sockaddr_atmsvc { struct atmif_sioc { int number; int length; - void __user * arg; + void * arg; }; typedef unsigned short atm_backend_t; #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/atmdev.h b/sysroots/x86_64-unknown-linux-musl/include/linux/atmdev.h index 69eb2400..74cdfc14 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/atmdev.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/atmdev.h @@ -86,7 +86,7 @@ struct atm_dev_stats { #define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG) struct atm_iobuf { int length; - void __user * buffer; + void * buffer; }; #define ATM_CI_MAX - 1 struct atm_cirange { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/blkpg.h b/sysroots/x86_64-unknown-linux-musl/include/linux/blkpg.h index fdde696e..bfe504ff 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/blkpg.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/blkpg.h @@ -25,7 +25,7 @@ struct blkpg_ioctl_arg { int op; int flags; int datalen; - void __user * data; + void * data; }; #define BLKPG_ADD_PARTITION 1 #define BLKPG_DEL_PARTITION 2 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/btrfs.h b/sysroots/x86_64-unknown-linux-musl/include/linux/btrfs.h index 80396255..0fdac660 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/btrfs.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/btrfs.h @@ -79,7 +79,7 @@ struct btrfs_ioctl_vol_args_v2 { union { struct { __u64 size; - struct btrfs_qgroup_inherit __user * qgroup_inherit; + struct btrfs_qgroup_inherit * qgroup_inherit; }; __u64 unused[4]; }; @@ -432,7 +432,7 @@ struct btrfs_ioctl_received_subvol_args { struct btrfs_ioctl_send_args { __s64 send_fd; __u64 clone_sources_count; - __u64 __user * clone_sources; + __u64 * clone_sources; __u64 parent_root; __u64 flags; __u32 version; @@ -469,7 +469,7 @@ struct btrfs_ioctl_get_subvol_rootref_args { __u8 align[7]; }; struct btrfs_ioctl_encoded_io_args { - const struct iovec __user * iov; + const struct iovec * iov; unsigned long iovcnt; __s64 offset; __u64 flags; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/big_endian.h b/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/big_endian.h index b6c978b4..82c5a4cd 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/big_endian.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/big_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) (__u32) (x)) -#define __constant_ntohl(x) ((__force __u32) (__be32) (x)) -#define __constant_htons(x) ((__force __be16) (__u16) (x)) -#define __constant_ntohs(x) ((__force __u16) (__be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) ___constant_swab64((x))) -#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) ___constant_swab32((x))) -#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) ___constant_swab16((x))) -#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __constant_be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __constant_be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __constant_be16_to_cpu(x) ((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) __swab64((x))) -#define __le64_to_cpu(x) __swab64((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) __swab32((x))) -#define __le32_to_cpu(x) __swab32((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) __swab16((x))) -#define __le16_to_cpu(x) __swab16((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) (__u64) (x)) -#define __be64_to_cpu(x) ((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) (__u32) (x)) -#define __be32_to_cpu(x) ((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) (__u16) (x)) -#define __be16_to_cpu(x) ((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) (__u32) (x)) +#define __constant_ntohl(x) (( __u32) (__be32) (x)) +#define __constant_htons(x) (( __be16) (__u16) (x)) +#define __constant_ntohs(x) (( __u16) (__be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) ___constant_swab64((x))) +#define __constant_le64_to_cpu(x) ___constant_swab64(( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) ___constant_swab32((x))) +#define __constant_le32_to_cpu(x) ___constant_swab32(( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) ___constant_swab16((x))) +#define __constant_le16_to_cpu(x) ___constant_swab16(( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __constant_be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __constant_be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __constant_be16_to_cpu(x) (( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) __swab64((x))) +#define __le64_to_cpu(x) __swab64(( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) __swab32((x))) +#define __le32_to_cpu(x) __swab32(( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) __swab16((x))) +#define __le16_to_cpu(x) __swab16(( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) (__u64) (x)) +#define __be64_to_cpu(x) (( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) (__u32) (x)) +#define __be32_to_cpu(x) (( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) (__u16) (x)) +#define __be16_to_cpu(x) (( __u16) (__be16) (x)) #define __cpu_to_le64s(x) __swab64s((x)) #define __le64_to_cpus(x) __swab64s((x)) #define __cpu_to_le32s(x) __swab32s((x)) diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/little_endian.h b/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/little_endian.h index a272d4d1..28155b5e 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/little_endian.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/byteorder/little_endian.h @@ -27,34 +27,34 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32) (x)) -#define __constant_htons(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16) (x)) -#define __constant_cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __constant_le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __constant_cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __constant_le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __constant_cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __constant_le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __constant_cpu_to_be64(x) ((__force __be64) ___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64) (__be64) (x)) -#define __constant_cpu_to_be32(x) ((__force __be32) ___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32) (__be32) (x)) -#define __constant_cpu_to_be16(x) ((__force __be16) ___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16) (__be16) (x)) -#define __cpu_to_le64(x) ((__force __le64) (__u64) (x)) -#define __le64_to_cpu(x) ((__force __u64) (__le64) (x)) -#define __cpu_to_le32(x) ((__force __le32) (__u32) (x)) -#define __le32_to_cpu(x) ((__force __u32) (__le32) (x)) -#define __cpu_to_le16(x) ((__force __le16) (__u16) (x)) -#define __le16_to_cpu(x) ((__force __u16) (__le16) (x)) -#define __cpu_to_be64(x) ((__force __be64) __swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64) (__be64) (x)) -#define __cpu_to_be32(x) ((__force __be32) __swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32) (__be32) (x)) -#define __cpu_to_be16(x) ((__force __be16) __swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16) (__be16) (x)) +#define __constant_htonl(x) (( __be32) ___constant_swab32((x))) +#define __constant_ntohl(x) ___constant_swab32(( __be32) (x)) +#define __constant_htons(x) (( __be16) ___constant_swab16((x))) +#define __constant_ntohs(x) ___constant_swab16(( __be16) (x)) +#define __constant_cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __constant_le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __constant_cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __constant_le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __constant_cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __constant_le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __constant_cpu_to_be64(x) (( __be64) ___constant_swab64((x))) +#define __constant_be64_to_cpu(x) ___constant_swab64(( __u64) (__be64) (x)) +#define __constant_cpu_to_be32(x) (( __be32) ___constant_swab32((x))) +#define __constant_be32_to_cpu(x) ___constant_swab32(( __u32) (__be32) (x)) +#define __constant_cpu_to_be16(x) (( __be16) ___constant_swab16((x))) +#define __constant_be16_to_cpu(x) ___constant_swab16(( __u16) (__be16) (x)) +#define __cpu_to_le64(x) (( __le64) (__u64) (x)) +#define __le64_to_cpu(x) (( __u64) (__le64) (x)) +#define __cpu_to_le32(x) (( __le32) (__u32) (x)) +#define __le32_to_cpu(x) (( __u32) (__le32) (x)) +#define __cpu_to_le16(x) (( __le16) (__u16) (x)) +#define __le16_to_cpu(x) (( __u16) (__le16) (x)) +#define __cpu_to_be64(x) (( __be64) __swab64((x))) +#define __be64_to_cpu(x) __swab64(( __u64) (__be64) (x)) +#define __cpu_to_be32(x) (( __be32) __swab32((x))) +#define __be32_to_cpu(x) __swab32(( __u32) (__be32) (x)) +#define __cpu_to_be16(x) (( __be16) __swab16((x))) +#define __be16_to_cpu(x) __swab16(( __u16) (__be16) (x)) #define __cpu_to_le64s(x) do { (void) (x); } while(0) #define __le64_to_cpus(x) do { (void) (x); } while(0) #define __cpu_to_le32s(x) do { (void) (x); } while(0) diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/capability.h b/sysroots/x86_64-unknown-linux-musl/include/linux/capability.h index c1b5dbff..8f3281ed 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/capability.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/capability.h @@ -28,12 +28,12 @@ typedef struct __user_cap_header_struct { __u32 version; int pid; -} __user * cap_user_header_t; +} * cap_user_header_t; typedef struct __user_cap_data_struct { __u32 effective; __u32 permitted; __u32 inheritable; -} __user * cap_user_data_t; +} * cap_user_data_t; #define VFS_CAP_REVISION_MASK 0xFF000000 #define VFS_CAP_REVISION_SHIFT 24 #define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/capi.h b/sysroots/x86_64-unknown-linux-musl/include/linux/capi.h index de2a8390..a09f9bc7 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/capi.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/capi.h @@ -51,7 +51,7 @@ typedef struct capi_profile { #define CAPI_GET_PROFILE _IOWR('C', 0x09, struct capi_profile) typedef struct capi_manufacturer_cmd { unsigned long cmd; - void __user * data; + void * data; } capi_manufacturer_cmd; #define CAPI_MANUFACTURER_CMD _IOWR('C', 0x20, struct capi_manufacturer_cmd) #define CAPI_GET_ERRCODE _IOR('C', 0x21, __u16) diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/cciss_ioctl.h b/sysroots/x86_64-unknown-linux-musl/include/linux/cciss_ioctl.h index 3e9bb3b0..827e6a00 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/cciss_ioctl.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/cciss_ioctl.h @@ -47,7 +47,7 @@ typedef struct _IOCTL_Command_struct { RequestBlock_struct Request; ErrorInfo_struct error_info; WORD buf_size; - BYTE __user * buf; + BYTE * buf; } IOCTL_Command_struct; typedef struct _BIG_IOCTL_Command_struct { LUNAddr_struct LUN_info; @@ -55,7 +55,7 @@ typedef struct _BIG_IOCTL_Command_struct { ErrorInfo_struct error_info; DWORD malloc_size; DWORD buf_size; - BYTE __user * buf; + BYTE * buf; } BIG_IOCTL_Command_struct; typedef struct _LogvolInfo_struct { __u32 LunID; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/cdrom.h b/sysroots/x86_64-unknown-linux-musl/include/linux/cdrom.h index 0fe07275..bd1d7df9 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/cdrom.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/cdrom.h @@ -128,7 +128,7 @@ struct cdrom_read_audio { union cdrom_addr addr; __u8 addr_format; int nframes; - __u8 __user * buf; + __u8 * buf; }; struct cdrom_multisession { union cdrom_addr addr; @@ -149,16 +149,16 @@ struct cdrom_blk { #define CGC_DATA_NONE 3 struct cdrom_generic_command { unsigned char cmd[CDROM_PACKET_SIZE]; - unsigned char __user * buffer; + unsigned char * buffer; unsigned int buflen; int stat; - struct request_sense __user * sense; + struct request_sense * sense; unsigned char data_direction; int quiet; int timeout; union { - void __user * reserved[1]; - void __user * unused; + void * reserved[1]; + void * unused; }; }; struct cdrom_timed_media_change_info { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/chio.h b/sysroots/x86_64-unknown-linux-musl/include/linux/chio.h index 725e7608..74f286f9 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/chio.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/chio.h @@ -71,7 +71,7 @@ struct changer_position { #define CP_INVERT 1 struct changer_element_status { int ces_type; - unsigned char __user * ces_data; + unsigned char * ces_data; }; #define CESTATUS_FULL 0x01 #define CESTATUS_IMPEXP 0x02 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/coda.h b/sysroots/x86_64-unknown-linux-musl/include/linux/coda.h index aad1b97b..5795cdf1 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/coda.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/coda.h @@ -505,13 +505,13 @@ union coda_downcalls { }; #define PIOCPARM_MASK 0x0000ffff struct ViceIoctl { - void __user * in; - void __user * out; + void * in; + void * out; u_short in_size; u_short out_size; }; struct PioctlData { - const char __user * path; + const char * path; int follow; struct ViceIoctl vi; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/comedi.h b/sysroots/x86_64-unknown-linux-musl/include/linux/comedi.h index e0d015a3..465d1bfc 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/comedi.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/comedi.h @@ -244,14 +244,14 @@ enum comedi_counter_status_flags { struct comedi_insn { unsigned int insn; unsigned int n; - unsigned int __user * data; + unsigned int * data; unsigned int subdev; unsigned int chanspec; unsigned int unused[3]; }; struct comedi_insnlist { unsigned int n_insns; - struct comedi_insn __user * insns; + struct comedi_insn * insns; }; struct comedi_cmd { unsigned int subdev; @@ -268,19 +268,19 @@ struct comedi_cmd { unsigned int stop_arg; unsigned int * chanlist; unsigned int chanlist_len; - short __user * data; + short * data; unsigned int data_len; }; struct comedi_chaninfo { unsigned int subdev; - unsigned int __user * maxdata_list; - unsigned int __user * flaglist; - unsigned int __user * rangelist; + unsigned int * maxdata_list; + unsigned int * flaglist; + unsigned int * rangelist; unsigned int unused[4]; }; struct comedi_rangeinfo { unsigned int range_type; - void __user * range_ptr; + void * range_ptr; }; struct comedi_krange { int min; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/compiler.h b/sysroots/x86_64-unknown-linux-musl/include/linux/compiler.h index 8e89655c..42d59aa4 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/compiler.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/compiler.h @@ -1,18 +1,11 @@ -#ifndef _UAPI_LINUX_COMPILER_H -#define _UAPI_LINUX_COMPILER_H +#pragma once /* - * This file is not currently in the Linux kernel tree. - * Upstream uapi headers refer to <linux/compiler.h> but there is - * no such uapi file. We've sent this upstream, and are optimistically - * adding it to bionic in the meantime. This should be replaced by - * a scrubbed header from external/kernel-headers when possible. + * There is no `include/uapi/linux/compiler.h`, just `include/linux/compiler.h`. * - * An alternative to this file is to check in a symbolic link to the - * non-uapi <linux/compiler.h>. That's fine for building bionic too. + * We don't need anything _in_ this file, but we do need this file. + * The two #defines are for backwards compatibility. */ -#define __user #define __force - -#endif /* _UAPI_LINUX_COMPILER_H */ +#define __user diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/compiler_types.h b/sysroots/x86_64-unknown-linux-musl/include/linux/compiler_types.h index 94f4fbe5..859ae055 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/compiler_types.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/compiler_types.h @@ -1,5 +1,11 @@ +#pragma once + /* - * The compiler.h file has been split into compiler.h and compiler_types.h. - * However, to compile bionic we only need the compiler.h. + * There is no `include/uapi/linux/compiler_types.h`, just + * `include/linux/compiler_types.h`. + * + * We don't need anything _in_ this file, but we do need this file. + * The #include is for backwards compatibility. */ + #include <linux/compiler.h> diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/cxl_mem.h b/sysroots/x86_64-unknown-linux-musl/include/linux/cxl_mem.h index 578cefd2..c94af873 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/cxl_mem.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/cxl_mem.h @@ -44,7 +44,7 @@ struct cxl_command_info { struct cxl_mem_query_commands { __u32 n_commands; __u32 rsvd; - struct cxl_command_info __user commands[]; + struct cxl_command_info commands[]; }; struct cxl_send_command { __u32 id; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/dlm_device.h b/sysroots/x86_64-unknown-linux-musl/include/linux/dlm_device.h index 5e54d2e4..e1b0c6d7 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/dlm_device.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/dlm_device.h @@ -33,11 +33,11 @@ struct dlm_lock_params { __u32 parent; __u64 xid; __u64 timeout; - void __user * castparam; - void __user * castaddr; - void __user * bastparam; - void __user * bastaddr; - struct dlm_lksb __user * lksb; + void * castparam; + void * castaddr; + void * bastparam; + void * bastaddr; + struct dlm_lksb * lksb; char lvb[DLM_USER_LVB_LEN]; char name[]; }; @@ -67,9 +67,9 @@ struct dlm_device_version { struct dlm_lock_result { __u32 version[3]; __u32 length; - void __user * user_astaddr; - void __user * user_astparam; - struct dlm_lksb __user * user_lksb; + void * user_astaddr; + void * user_astparam; + struct dlm_lksb * user_lksb; struct dlm_lksb lksb; __u8 bast_mode; __u8 unused[3]; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/osd.h b/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/osd.h index 84b268b9..379294ed 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/osd.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/osd.h @@ -50,7 +50,7 @@ typedef struct osd_cmd_s { int x1; int y1; int color; - void __user * data; + void * data; } osd_cmd_t; typedef enum { OSD_BITMAP1, diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/video.h b/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/video.h index 6577e1ff..24587666 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/video.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/dvb/video.h @@ -94,7 +94,7 @@ struct video_status { video_displayformat_t display_format; }; struct video_still_picture { - char __user * iFrame; + char * iFrame; __s32 size; }; typedef __u16 video_attributes_t; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/eventpoll.h b/sysroots/x86_64-unknown-linux-musl/include/linux/eventpoll.h index 2a1a26a6..de4c1f1c 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/eventpoll.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/eventpoll.h @@ -25,23 +25,23 @@ #define EPOLL_CTL_ADD 1 #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 -#define EPOLLIN (__force __poll_t) 0x00000001 -#define EPOLLPRI (__force __poll_t) 0x00000002 -#define EPOLLOUT (__force __poll_t) 0x00000004 -#define EPOLLERR (__force __poll_t) 0x00000008 -#define EPOLLHUP (__force __poll_t) 0x00000010 -#define EPOLLNVAL (__force __poll_t) 0x00000020 -#define EPOLLRDNORM (__force __poll_t) 0x00000040 -#define EPOLLRDBAND (__force __poll_t) 0x00000080 -#define EPOLLWRNORM (__force __poll_t) 0x00000100 -#define EPOLLWRBAND (__force __poll_t) 0x00000200 -#define EPOLLMSG (__force __poll_t) 0x00000400 -#define EPOLLRDHUP (__force __poll_t) 0x00002000 -#define EPOLL_URING_WAKE ((__force __poll_t) (1U << 27)) -#define EPOLLEXCLUSIVE ((__force __poll_t) (1U << 28)) -#define EPOLLWAKEUP ((__force __poll_t) (1U << 29)) -#define EPOLLONESHOT ((__force __poll_t) (1U << 30)) -#define EPOLLET ((__force __poll_t) (1U << 31)) +#define EPOLLIN ( __poll_t) 0x00000001 +#define EPOLLPRI ( __poll_t) 0x00000002 +#define EPOLLOUT ( __poll_t) 0x00000004 +#define EPOLLERR ( __poll_t) 0x00000008 +#define EPOLLHUP ( __poll_t) 0x00000010 +#define EPOLLNVAL ( __poll_t) 0x00000020 +#define EPOLLRDNORM ( __poll_t) 0x00000040 +#define EPOLLRDBAND ( __poll_t) 0x00000080 +#define EPOLLWRNORM ( __poll_t) 0x00000100 +#define EPOLLWRBAND ( __poll_t) 0x00000200 +#define EPOLLMSG ( __poll_t) 0x00000400 +#define EPOLLRDHUP ( __poll_t) 0x00002000 +#define EPOLL_URING_WAKE (( __poll_t) (1U << 27)) +#define EPOLLEXCLUSIVE (( __poll_t) (1U << 28)) +#define EPOLLWAKEUP (( __poll_t) (1U << 29)) +#define EPOLLONESHOT (( __poll_t) (1U << 30)) +#define EPOLLET (( __poll_t) (1U << 31)) #ifdef __x86_64__ #define EPOLL_PACKED __attribute__((packed)) #else diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/fd.h b/sysroots/x86_64-unknown-linux-musl/include/linux/fd.h index 4d72d695..dc1d4446 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/fd.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/fd.h @@ -175,7 +175,7 @@ struct floppy_raw_cmd { #define FD_RAW_SOFTFAILURE 0x800 #define FD_RAW_FAILURE 0x10000 #define FD_RAW_HARDFAILURE 0x20000 - void __user * data; + void * data; char * kernel_data; struct floppy_raw_cmd * next; long length; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/filter.h b/sysroots/x86_64-unknown-linux-musl/include/linux/filter.h index d13c59d3..57fe2fbe 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/filter.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/filter.h @@ -31,7 +31,7 @@ struct sock_filter { }; struct sock_fprog { unsigned short len; - struct sock_filter __user * filter; + struct sock_filter * filter; }; #define BPF_RVAL(code) ((code) & 0x18) #define BPF_A 0x10 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/fs.h b/sysroots/x86_64-unknown-linux-musl/include/linux/fs.h index 96f91812..b8bfaacf 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/fs.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/fs.h @@ -190,10 +190,10 @@ struct fsxattr { #define SYNC_FILE_RANGE_WAIT_AFTER 4 #define SYNC_FILE_RANGE_WRITE_AND_WAIT (SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WAIT_AFTER) typedef int __bitwise __kernel_rwf_t; -#define RWF_HIPRI ((__force __kernel_rwf_t) 0x00000001) -#define RWF_DSYNC ((__force __kernel_rwf_t) 0x00000002) -#define RWF_SYNC ((__force __kernel_rwf_t) 0x00000004) -#define RWF_NOWAIT ((__force __kernel_rwf_t) 0x00000008) -#define RWF_APPEND ((__force __kernel_rwf_t) 0x00000010) +#define RWF_HIPRI (( __kernel_rwf_t) 0x00000001) +#define RWF_DSYNC (( __kernel_rwf_t) 0x00000002) +#define RWF_SYNC (( __kernel_rwf_t) 0x00000004) +#define RWF_NOWAIT (( __kernel_rwf_t) 0x00000008) +#define RWF_APPEND (( __kernel_rwf_t) 0x00000010) #define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND) #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/futex.h b/sysroots/x86_64-unknown-linux-musl/include/linux/futex.h index c80b90c5..8d1a2a45 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/futex.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/futex.h @@ -59,12 +59,12 @@ struct futex_waitv { __u32 __reserved; }; struct robust_list { - struct robust_list __user * next; + struct robust_list * next; }; struct robust_list_head { struct robust_list list; long futex_offset; - struct robust_list __user * list_op_pending; + struct robust_list * list_op_pending; }; #define FUTEX_WAITERS 0x80000000 #define FUTEX_OWNER_DIED 0x40000000 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/i2c-dev.h b/sysroots/x86_64-unknown-linux-musl/include/linux/i2c-dev.h index 07fdda2b..7a25e20e 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/i2c-dev.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/i2c-dev.h @@ -33,10 +33,10 @@ struct i2c_smbus_ioctl_data { __u8 read_write; __u8 command; __u32 size; - union i2c_smbus_data __user * data; + union i2c_smbus_data * data; }; struct i2c_rdwr_ioctl_data { - struct i2c_msg __user * msgs; + struct i2c_msg * msgs; __u32 nmsgs; }; #define I2C_RDWR_IOCTL_MAX_MSGS 42 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/i2o-dev.h b/sysroots/x86_64-unknown-linux-musl/include/linux/i2o-dev.h index fc8b26d0..afaae74c 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/i2o-dev.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/i2o-dev.h @@ -42,38 +42,38 @@ struct i2o_cmd_passthru32 { }; struct i2o_cmd_passthru { unsigned int iop; - void __user * msg; + void * msg; }; struct i2o_cmd_hrtlct { unsigned int iop; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_cmd_psetget { unsigned int iop; unsigned int tid; - void __user * opbuf; + void * opbuf; unsigned int oplen; - void __user * resbuf; - unsigned int __user * reslen; + void * resbuf; + unsigned int * reslen; }; struct i2o_sw_xfer { unsigned int iop; unsigned char flags; unsigned char sw_type; unsigned int sw_id; - void __user * buf; - unsigned int __user * swlen; - unsigned int __user * maxfrag; - unsigned int __user * curfrag; + void * buf; + unsigned int * swlen; + unsigned int * maxfrag; + unsigned int * curfrag; }; struct i2o_html { unsigned int iop; unsigned int tid; unsigned int page; - void __user * resbuf; - unsigned int __user * reslen; - void __user * qbuf; + void * resbuf; + unsigned int * reslen; + void * qbuf; unsigned int qlen; }; #define I2O_EVT_Q_LEN 32 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/if.h b/sysroots/x86_64-unknown-linux-musl/include/linux/if.h index 63c77ebd..fc6d20d7 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/if.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/if.h @@ -130,14 +130,14 @@ struct if_settings { unsigned int type; unsigned int size; union { - raw_hdlc_proto __user * raw_hdlc; - cisco_proto __user * cisco; - fr_proto __user * fr; - fr_proto_pvc __user * fr_pvc; - fr_proto_pvc_info __user * fr_pvc_info; - x25_hdlc_proto __user * x25; - sync_serial_settings __user * sync; - te1_settings __user * te1; + raw_hdlc_proto * raw_hdlc; + cisco_proto * cisco; + fr_proto * fr; + fr_proto_pvc * fr_pvc; + fr_proto_pvc_info * fr_pvc_info; + x25_hdlc_proto * x25; + sync_serial_settings * sync; + te1_settings * te1; } ifs_ifsu; }; #if __UAPI_DEF_IF_IFREQ @@ -158,7 +158,7 @@ struct ifreq { struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; char ifru_newname[IFNAMSIZ]; - void __user * ifru_data; + void * ifru_data; struct if_settings ifru_settings; } ifr_ifru; }; @@ -184,8 +184,8 @@ struct ifreq { struct ifconf { int ifc_len; union { - char __user * ifcu_buf; - struct ifreq __user * ifcu_req; + char * ifcu_buf; + struct ifreq * ifcu_req; } ifc_ifcu; }; #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/if_tunnel.h b/sysroots/x86_64-unknown-linux-musl/include/linux/if_tunnel.h index 01c2dc93..9b85568e 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/if_tunnel.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/if_tunnel.h @@ -142,7 +142,7 @@ enum { __IFLA_GRE_MAX, }; #define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) -#define VTI_ISVTI ((__force __be16) 0x0001) +#define VTI_ISVTI (( __be16) 0x0001) enum { IFLA_VTI_UNSPEC, IFLA_VTI_LINK, diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/input.h b/sysroots/x86_64-unknown-linux-musl/include/linux/input.h index 4858c817..1df1398f 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/input.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/input.h @@ -173,7 +173,7 @@ struct ff_periodic_effect { __u16 phase; struct ff_envelope envelope; __u32 custom_len; - __s16 __user * custom_data; + __s16 * custom_data; }; struct ff_rumble_effect { __u16 strong_magnitude; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/ipc.h b/sysroots/x86_64-unknown-linux-musl/include/linux/ipc.h index a0699cf3..4ca9ee15 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/ipc.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/ipc.h @@ -42,7 +42,7 @@ struct __kernel_legacy_ipc_perm { #define IPC_OLD 0 #define IPC_64 0x0100 struct ipc_kludge { - struct msgbuf __user * msgp; + struct msgbuf * msgp; long msgtyp; }; #define SEMOP 1 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/ipmi.h b/sysroots/x86_64-unknown-linux-musl/include/linux/ipmi.h index dd88f2f7..bd73b3c3 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/ipmi.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/ipmi.h @@ -65,7 +65,7 @@ struct ipmi_msg { unsigned char netfn; unsigned char cmd; unsigned short data_len; - unsigned char __user * data; + unsigned char * data; }; struct kernel_ipmi_msg { unsigned char netfn; @@ -86,7 +86,7 @@ struct kernel_ipmi_msg { #define IPMI_MAINTENANCE_MODE_ON 2 #define IPMI_IOC_MAGIC 'i' struct ipmi_req { - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; @@ -100,7 +100,7 @@ struct ipmi_req_settime { #define IPMICTL_SEND_COMMAND_SETTIME _IOR(IPMI_IOC_MAGIC, 21, struct ipmi_req_settime) struct ipmi_recv { int recv_type; - unsigned char __user * addr; + unsigned char * addr; unsigned int addr_len; long msgid; struct ipmi_msg msg; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/ivtv.h b/sysroots/x86_64-unknown-linux-musl/include/linux/ivtv.h index 549d6a89..bdd526ed 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/ivtv.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/ivtv.h @@ -24,8 +24,8 @@ struct ivtv_dma_frame { enum v4l2_buf_type type; __u32 pixelformat; - void __user * y_source; - void __user * uv_source; + void * y_source; + void * uv_source; struct v4l2_rect src; struct v4l2_rect dst; __u32 src_width; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/ivtvfb.h b/sysroots/x86_64-unknown-linux-musl/include/linux/ivtvfb.h index 9addcbf9..171be74d 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/ivtvfb.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/ivtvfb.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct ivtvfb_dma_frame { - void __user * source; + void * source; unsigned long dest_offset; int count; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/kd.h b/sysroots/x86_64-unknown-linux-musl/include/linux/kd.h index 2385037f..903681b7 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/kd.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/kd.h @@ -27,7 +27,7 @@ struct consolefontdesc { unsigned short charcount; unsigned short charheight; - char __user * chardata; + char * chardata; }; #define PIO_FONTRESET 0x4B6D #define GIO_CMAP 0x4B70 @@ -68,7 +68,7 @@ struct unipair { }; struct unimapdesc { unsigned short entry_ct; - struct unipair __user * entries; + struct unipair * entries; }; #define PIO_UNIMAP 0x4B67 #define PIO_UNIMAPCLR 0x4B68 @@ -147,7 +147,7 @@ struct console_font_op { unsigned int flags; unsigned int width, height; unsigned int charcount; - unsigned char __user * data; + unsigned char * data; }; struct console_font { unsigned int width, height; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/keyctl.h b/sysroots/x86_64-unknown-linux-musl/include/linux/keyctl.h index 01ea576d..b534f5eb 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/keyctl.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/keyctl.h @@ -80,8 +80,8 @@ struct keyctl_dh_params { __s32 base; }; struct keyctl_kdf_params { - char __user * hashname; - char __user * otherinfo; + char * hashname; + char * otherinfo; __u32 otherinfolen; __u32 __spare[8]; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/kvm.h b/sysroots/x86_64-unknown-linux-musl/include/linux/kvm.h index 9566f01d..9d33399f 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/kvm.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/kvm.h @@ -457,7 +457,7 @@ struct kvm_dirty_log { __u32 slot; __u32 padding1; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; @@ -466,7 +466,7 @@ struct kvm_clear_dirty_log { __u32 num_pages; __u64 first_page; union { - void __user * dirty_bitmap; + void * dirty_bitmap; __u64 padding2; }; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/media.h b/sysroots/x86_64-unknown-linux-musl/include/linux/media.h index 869d47b4..fe97e90f 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/media.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/media.h @@ -125,8 +125,8 @@ struct media_link_desc { }; struct media_links_enum { __u32 entity; - struct media_pad_desc __user * pads; - struct media_link_desc __user * links; + struct media_pad_desc * pads; + struct media_link_desc * links; __u32 reserved[4]; }; #define MEDIA_INTF_T_DVB_BASE 0x00000100 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h index 862f514f..b1fb5377 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_arp/arp_tables.h @@ -98,7 +98,7 @@ struct arpt_replace { unsigned int hook_entry[NF_ARP_NUMHOOKS]; unsigned int underflow[NF_ARP_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct arpt_entry entries[]; }; struct arpt_get_entries { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h index 7c8f435c..d87d65e6 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_bridge/ebtables.h @@ -42,10 +42,10 @@ struct ebt_replace { unsigned int valid_hooks; unsigned int nentries; unsigned int entries_size; - struct ebt_entries __user * hook_entry[NF_BR_NUMHOOKS]; + struct ebt_entries * hook_entry[NF_BR_NUMHOOKS]; unsigned int num_counters; - struct ebt_counter __user * counters; - char __user * entries; + struct ebt_counter * counters; + char * entries; }; struct ebt_replace_kernel { char name[EBT_TABLE_MAXNAMELEN]; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h index 14a65adc..5179be40 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv4/ip_tables.h @@ -112,7 +112,7 @@ struct ipt_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ipt_entry entries[]; }; struct ipt_get_entries { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h index 22071db8..8c4ec88a 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/netfilter_ipv6/ip6_tables.h @@ -132,7 +132,7 @@ struct ip6t_replace { unsigned int hook_entry[NF_INET_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS]; unsigned int num_counters; - struct xt_counters __user * counters; + struct xt_counters * counters; struct ip6t_entry entries[]; }; struct ip6t_get_entries { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/nfs4_mount.h b/sysroots/x86_64-unknown-linux-musl/include/linux/nfs4_mount.h index 0f794dd0..9b9c9f8a 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/nfs4_mount.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/nfs4_mount.h @@ -21,7 +21,7 @@ #define NFS4_MOUNT_VERSION 1 struct nfs_string { unsigned int len; - const char __user * data; + const char * data; }; struct nfs4_mount_data { int version; @@ -38,10 +38,10 @@ struct nfs4_mount_data { struct nfs_string mnt_path; struct nfs_string hostname; unsigned int host_addrlen; - struct sockaddr __user * host_addr; + struct sockaddr * host_addr; int proto; int auth_flavourlen; - int __user * auth_flavours; + int * auth_flavours; }; #define NFS4_MOUNT_SOFT 0x0001 #define NFS4_MOUNT_INTR 0x0002 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/omap3isp.h b/sysroots/x86_64-unknown-linux-musl/include/linux/omap3isp.h index 53345e3f..18346587 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/omap3isp.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/omap3isp.h @@ -88,7 +88,7 @@ struct omap3isp_h3a_aewb_config { }; struct omap3isp_stat_data { struct timeval ts; - void __user * buf; + void * buf; __struct_group(, frame,, __u32 buf_size; __u16 frame_number; __u16 cur_frame; @@ -224,12 +224,12 @@ struct omap3isp_ccdc_update_config { __u16 update; __u16 flag; enum omap3isp_alaw_ipwidth alawip; - struct omap3isp_ccdc_bclamp __user * bclamp; - struct omap3isp_ccdc_blcomp __user * blcomp; - struct omap3isp_ccdc_fpc __user * fpc; - struct omap3isp_ccdc_lsc_config __user * lsc_cfg; - struct omap3isp_ccdc_culling __user * cull; - __u8 __user * lsc; + struct omap3isp_ccdc_bclamp * bclamp; + struct omap3isp_ccdc_blcomp * blcomp; + struct omap3isp_ccdc_fpc * fpc; + struct omap3isp_ccdc_lsc_config * lsc_cfg; + struct omap3isp_ccdc_culling * cull; + __u8 * lsc; }; #define OMAP3ISP_PREV_LUMAENH (1 << 0) #define OMAP3ISP_PREV_INVALAW (1 << 1) @@ -323,17 +323,17 @@ struct omap3isp_prev_update_config { __u32 update; __u32 flag; __u32 shading_shift; - struct omap3isp_prev_luma __user * luma; - struct omap3isp_prev_hmed __user * hmed; - struct omap3isp_prev_cfa __user * cfa; - struct omap3isp_prev_csup __user * csup; - struct omap3isp_prev_wbal __user * wbal; - struct omap3isp_prev_blkadj __user * blkadj; - struct omap3isp_prev_rgbtorgb __user * rgb2rgb; - struct omap3isp_prev_csc __user * csc; - struct omap3isp_prev_yclimit __user * yclimit; - struct omap3isp_prev_dcor __user * dcor; - struct omap3isp_prev_nf __user * nf; - struct omap3isp_prev_gtables __user * gamma; + struct omap3isp_prev_luma * luma; + struct omap3isp_prev_hmed * hmed; + struct omap3isp_prev_cfa * cfa; + struct omap3isp_prev_csup * csup; + struct omap3isp_prev_wbal * wbal; + struct omap3isp_prev_blkadj * blkadj; + struct omap3isp_prev_rgbtorgb * rgb2rgb; + struct omap3isp_prev_csc * csc; + struct omap3isp_prev_yclimit * yclimit; + struct omap3isp_prev_dcor * dcor; + struct omap3isp_prev_nf * nf; + struct omap3isp_prev_gtables * gamma; }; #endif diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/omapfb.h b/sysroots/x86_64-unknown-linux-musl/include/linux/omapfb.h index 6ebec085..632e4689 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/omapfb.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/omapfb.h @@ -153,7 +153,7 @@ struct omapfb_memory_read { __u16 w; __u16 h; size_t buffer_size; - void __user * buffer; + void * buffer; }; struct omapfb_ovl_colormode { __u8 overlay_idx; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/ppp-ioctl.h b/sysroots/x86_64-unknown-linux-musl/include/linux/ppp-ioctl.h index 69c6e6d9..165d4477 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/ppp-ioctl.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/ppp-ioctl.h @@ -56,7 +56,7 @@ struct npioctl { enum NPmode mode; }; struct ppp_option_data { - __u8 __user * ptr; + __u8 * ptr; __u32 length; int transmit; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/route.h b/sysroots/x86_64-unknown-linux-musl/include/linux/route.h index 4ba6023d..f33327cc 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/route.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/route.h @@ -30,7 +30,7 @@ struct rtentry { unsigned long rt_pad3; void * rt_pad4; short rt_metric; - char __user * rt_dev; + char * rt_dev; unsigned long rt_mtu; #define rt_mss rt_mtu unsigned long rt_window; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/sem.h b/sysroots/x86_64-unknown-linux-musl/include/linux/sem.h index 98ed1bf3..c2f25e7d 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/sem.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/sem.h @@ -48,10 +48,10 @@ struct sembuf { }; union __kernel_legacy_semun { int val; - struct __kernel_legacy_semid_ds __user * buf; - unsigned short __user * array; - struct seminfo __user * __buf; - void __user * __pad; + struct __kernel_legacy_semid_ds * buf; + unsigned short * array; + struct seminfo * __buf; + void * __pad; }; struct seminfo { int semmap; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/sysctl.h b/sysroots/x86_64-unknown-linux-musl/include/linux/sysctl.h index ff17f7c5..5714323f 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/sysctl.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/sysctl.h @@ -23,11 +23,11 @@ #include <linux/compiler.h> #define CTL_MAXNAME 10 struct __sysctl_args { - int __user * name; + int * name; int nlen; - void __user * oldval; - size_t __user * oldlenp; - void __user * newval; + void * oldval; + size_t * oldlenp; + void * newval; size_t newlen; unsigned long __linux_unused[4]; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/time.h b/sysroots/x86_64-unknown-linux-musl/include/linux/time.h index df52295d..55d0e6e9 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/time.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/time.h @@ -18,14 +18,11 @@ ****************************************************************************/ #ifndef _UAPI_LINUX_TIME_H #define _UAPI_LINUX_TIME_H +#include <bits/timespec.h> #include <linux/types.h> #include <linux/time_types.h> #ifndef _STRUCT_TIMESPEC #define _STRUCT_TIMESPEC -struct timespec { - __kernel_old_time_t tv_sec; - long tv_nsec; -}; #endif struct timeval { __kernel_old_time_t tv_sec; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/uhid.h b/sysroots/x86_64-unknown-linux-musl/include/linux/uhid.h index 228ee503..1d471f84 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/uhid.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/uhid.h @@ -106,7 +106,7 @@ struct uhid_create_req { __u8 name[128]; __u8 phys[64]; __u8 uniq[64]; - __u8 __user * rd_data; + __u8 * rd_data; __u16 rd_size; __u16 bus; __u32 vendor; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/uio.h b/sysroots/x86_64-unknown-linux-musl/include/linux/uio.h index fa955cd0..04814c71 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/uio.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/uio.h @@ -21,7 +21,7 @@ #include <linux/compiler.h> #include <linux/types.h> struct iovec { - void __user * iov_base; + void * iov_base; __kernel_size_t iov_len; }; #define UIO_FASTIOV 8 diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/usb/tmc.h b/sysroots/x86_64-unknown-linux-musl/include/linux/usb/tmc.h index 6d0add1e..b2672901 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/usb/tmc.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/usb/tmc.h @@ -46,7 +46,7 @@ struct usbtmc_request { } __attribute__((packed)); struct usbtmc_ctrlrequest { struct usbtmc_request req; - void __user * data; + void * data; } __attribute__((packed)); struct usbtmc_termchar { __u8 term_char; @@ -59,7 +59,7 @@ struct usbtmc_message { __u32 transfer_size; __u32 transferred; __u32 flags; - void __user * message; + void * message; } __attribute__((packed)); #define USBTMC_IOC_NR 91 #define USBTMC_IOCTL_INDICATOR_PULSE _IO(USBTMC_IOC_NR, 1) diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/usbdevice_fs.h b/sysroots/x86_64-unknown-linux-musl/include/linux/usbdevice_fs.h index 5fef522e..af8681b3 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/usbdevice_fs.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/usbdevice_fs.h @@ -27,13 +27,13 @@ struct usbdevfs_ctrltransfer { __u16 wIndex; __u16 wLength; __u32 timeout; - void __user * data; + void * data; }; struct usbdevfs_bulktransfer { unsigned int ep; unsigned int len; unsigned int timeout; - void __user * data; + void * data; }; struct usbdevfs_setinterface { unsigned int interface; @@ -41,7 +41,7 @@ struct usbdevfs_setinterface { }; struct usbdevfs_disconnectsignal { unsigned int signr; - void __user * context; + void * context; }; #define USBDEVFS_MAXDRIVERNAME 255 struct usbdevfs_getdriver { @@ -80,7 +80,7 @@ struct usbdevfs_urb { unsigned char endpoint; int status; unsigned int flags; - void __user * buffer; + void * buffer; int buffer_length; int actual_length; int start_frame; @@ -90,13 +90,13 @@ struct usbdevfs_urb { }; int error_count; unsigned int signr; - void __user * usercontext; + void * usercontext; struct usbdevfs_iso_packet_desc iso_frame_desc[]; }; struct usbdevfs_ioctl { int ifno; int ioctl_code; - void __user * data; + void * data; }; struct usbdevfs_hub_portinfo { char nports; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/uvcvideo.h b/sysroots/x86_64-unknown-linux-musl/include/linux/uvcvideo.h index 46528a93..f15ed784 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/uvcvideo.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/uvcvideo.h @@ -49,7 +49,7 @@ struct uvc_xu_control_mapping { __u8 offset; __u32 v4l2_type; __u32 data_type; - struct uvc_menu_info __user * menu_info; + struct uvc_menu_info * menu_info; __u32 menu_count; __u32 reserved[4]; }; @@ -58,7 +58,7 @@ struct uvc_xu_control_query { __u8 selector; __u8 query; __u16 size; - __u8 __user * data; + __u8 * data; }; #define UVCIOC_CTRL_MAP _IOWR('u', 0x20, struct uvc_xu_control_mapping) #define UVCIOC_CTRL_QUERY _IOWR('u', 0x21, struct uvc_xu_control_query) diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/vfio.h b/sysroots/x86_64-unknown-linux-musl/include/linux/vfio.h index 7dc3440f..3c1821c2 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/vfio.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/vfio.h @@ -390,7 +390,7 @@ struct vfio_iommu_type1_dma_map { struct vfio_bitmap { __u64 pgsize; __u64 size; - __u64 __user * data; + __u64 * data; }; struct vfio_iommu_type1_dma_unmap { __u32 argsz; diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/videodev2.h b/sysroots/x86_64-unknown-linux-musl/include/linux/videodev2.h index d418fd20..4fb0a254 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/videodev2.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/videodev2.h @@ -650,7 +650,7 @@ struct v4l2_framebuffer { #define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip __user * next; + struct v4l2_clip * next; }; struct v4l2_window { struct v4l2_rect w; @@ -658,7 +658,7 @@ struct v4l2_window { __u32 chromakey; struct v4l2_clip * clips; __u32 clipcount; - void __user * bitmap; + void * bitmap; __u8 global_alpha; }; struct v4l2_captureparm { @@ -895,32 +895,32 @@ struct v4l2_ext_control { union { __s32 value; __s64 value64; - char __user * string; - __u8 __user * p_u8; - __u16 __user * p_u16; - __u32 __user * p_u32; - __u32 __user * p_s32; - __u32 __user * p_s64; - struct v4l2_area __user * p_area; - struct v4l2_ctrl_h264_sps __user * p_h264_sps; + char * string; + __u8 * p_u8; + __u16 * p_u16; + __u32 * p_u32; + __u32 * p_s32; + __u32 * p_s64; + struct v4l2_area * p_area; + struct v4l2_ctrl_h264_sps * p_h264_sps; struct v4l2_ctrl_h264_pps * p_h264_pps; - struct v4l2_ctrl_h264_scaling_matrix __user * p_h264_scaling_matrix; - struct v4l2_ctrl_h264_pred_weights __user * p_h264_pred_weights; - struct v4l2_ctrl_h264_slice_params __user * p_h264_slice_params; - struct v4l2_ctrl_h264_decode_params __user * p_h264_decode_params; - struct v4l2_ctrl_fwht_params __user * p_fwht_params; - struct v4l2_ctrl_vp8_frame __user * p_vp8_frame; - struct v4l2_ctrl_mpeg2_sequence __user * p_mpeg2_sequence; - struct v4l2_ctrl_mpeg2_picture __user * p_mpeg2_picture; - struct v4l2_ctrl_mpeg2_quantisation __user * p_mpeg2_quantisation; - struct v4l2_ctrl_vp9_compressed_hdr __user * p_vp9_compressed_hdr_probs; - struct v4l2_ctrl_vp9_frame __user * p_vp9_frame; - struct v4l2_ctrl_hevc_sps __user * p_hevc_sps; - struct v4l2_ctrl_hevc_pps __user * p_hevc_pps; - struct v4l2_ctrl_hevc_slice_params __user * p_hevc_slice_params; - struct v4l2_ctrl_hevc_scaling_matrix __user * p_hevc_scaling_matrix; - struct v4l2_ctrl_hevc_decode_params __user * p_hevc_decode_params; - void __user * ptr; + struct v4l2_ctrl_h264_scaling_matrix * p_h264_scaling_matrix; + struct v4l2_ctrl_h264_pred_weights * p_h264_pred_weights; + struct v4l2_ctrl_h264_slice_params * p_h264_slice_params; + struct v4l2_ctrl_h264_decode_params * p_h264_decode_params; + struct v4l2_ctrl_fwht_params * p_fwht_params; + struct v4l2_ctrl_vp8_frame * p_vp8_frame; + struct v4l2_ctrl_mpeg2_sequence * p_mpeg2_sequence; + struct v4l2_ctrl_mpeg2_picture * p_mpeg2_picture; + struct v4l2_ctrl_mpeg2_quantisation * p_mpeg2_quantisation; + struct v4l2_ctrl_vp9_compressed_hdr * p_vp9_compressed_hdr_probs; + struct v4l2_ctrl_vp9_frame * p_vp9_frame; + struct v4l2_ctrl_hevc_sps * p_hevc_sps; + struct v4l2_ctrl_hevc_pps * p_hevc_pps; + struct v4l2_ctrl_hevc_slice_params * p_hevc_slice_params; + struct v4l2_ctrl_hevc_scaling_matrix * p_hevc_scaling_matrix; + struct v4l2_ctrl_hevc_decode_params * p_hevc_decode_params; + void * ptr; }; } __attribute__((packed)); struct v4l2_ext_controls { diff --git a/sysroots/x86_64-unknown-linux-musl/include/linux/wireless.h b/sysroots/x86_64-unknown-linux-musl/include/linux/wireless.h index ca31dd23..eb57fff1 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/linux/wireless.h +++ b/sysroots/x86_64-unknown-linux-musl/include/linux/wireless.h @@ -264,7 +264,7 @@ struct iw_param { __u16 flags; }; struct iw_point { - void __user * pointer; + void * pointer; __u16 length; __u16 flags; }; diff --git a/sysroots/x86_64-unknown-linux-musl/include/mtd/mtd-abi.h b/sysroots/x86_64-unknown-linux-musl/include/mtd/mtd-abi.h index 6e26cae8..aed2acc1 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/mtd/mtd-abi.h +++ b/sysroots/x86_64-unknown-linux-musl/include/mtd/mtd-abi.h @@ -30,7 +30,7 @@ struct erase_info_user64 { struct mtd_oob_buf { __u32 start; __u32 length; - unsigned char __user * ptr; + unsigned char * ptr; }; struct mtd_oob_buf64 { __u64 start; diff --git a/sysroots/x86_64-unknown-linux-musl/include/scsi/sg.h b/sysroots/x86_64-unknown-linux-musl/include/scsi/sg.h index 6911b163..9ba6cd64 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/scsi/sg.h +++ b/sysroots/x86_64-unknown-linux-musl/include/scsi/sg.h @@ -20,7 +20,7 @@ #define _SCSI_GENERIC_H #include <linux/compiler.h> typedef struct sg_iovec { - void __user * iov_base; + void * iov_base; size_t iov_len; } sg_iovec_t; typedef struct sg_io_hdr { @@ -30,13 +30,13 @@ typedef struct sg_io_hdr { unsigned char mx_sb_len; unsigned short iovec_count; unsigned int dxfer_len; - void __user * dxferp; - unsigned char __user * cmdp; - void __user * sbp; + void * dxferp; + unsigned char * cmdp; + void * sbp; unsigned int timeout; unsigned int flags; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned char status; unsigned char masked_status; unsigned char msg_status; @@ -96,7 +96,7 @@ typedef struct sg_req_info { char sg_io_owned; char problem; int pack_id; - void __user * usr_ptr; + void * usr_ptr; unsigned int duration; int unused; } sg_req_info_t; diff --git a/sysroots/x86_64-unknown-linux-musl/include/sound/asequencer.h b/sysroots/x86_64-unknown-linux-musl/include/sound/asequencer.h index 0076933a..01a50585 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/sound/asequencer.h +++ b/sysroots/x86_64-unknown-linux-musl/include/sound/asequencer.h @@ -209,9 +209,9 @@ struct snd_seq_running_info { #define SNDRV_SEQ_CLIENT_DUMMY 14 #define SNDRV_SEQ_CLIENT_OSS 15 typedef int __bitwise snd_seq_client_type_t; -#define NO_CLIENT ((__force snd_seq_client_type_t) 0) -#define USER_CLIENT ((__force snd_seq_client_type_t) 1) -#define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) +#define NO_CLIENT (( snd_seq_client_type_t) 0) +#define USER_CLIENT (( snd_seq_client_type_t) 1) +#define KERNEL_CLIENT (( snd_seq_client_type_t) 2) #define SNDRV_SEQ_FILTER_BROADCAST (1U << 0) #define SNDRV_SEQ_FILTER_MULTICAST (1U << 1) #define SNDRV_SEQ_FILTER_BOUNCE (1U << 2) diff --git a/sysroots/x86_64-unknown-linux-musl/include/sound/asound.h b/sysroots/x86_64-unknown-linux-musl/include/sound/asound.h index 6e325e90..9c1a3ae7 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/sound/asound.h +++ b/sysroots/x86_64-unknown-linux-musl/include/sound/asound.h @@ -96,7 +96,7 @@ struct snd_hwdep_dsp_status { struct snd_hwdep_dsp_image { unsigned int index; unsigned char name[64]; - unsigned char __user * image; + unsigned char * image; size_t length; unsigned long driver_data; }; @@ -125,64 +125,64 @@ enum { SNDRV_PCM_STREAM_LAST = SNDRV_PCM_STREAM_CAPTURE, }; typedef int __bitwise snd_pcm_access_t; -#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((__force snd_pcm_access_t) 0) -#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((__force snd_pcm_access_t) 1) -#define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((__force snd_pcm_access_t) 2) -#define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((__force snd_pcm_access_t) 3) -#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((__force snd_pcm_access_t) 4) +#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED (( snd_pcm_access_t) 0) +#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED (( snd_pcm_access_t) 1) +#define SNDRV_PCM_ACCESS_MMAP_COMPLEX (( snd_pcm_access_t) 2) +#define SNDRV_PCM_ACCESS_RW_INTERLEAVED (( snd_pcm_access_t) 3) +#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED (( snd_pcm_access_t) 4) #define SNDRV_PCM_ACCESS_LAST SNDRV_PCM_ACCESS_RW_NONINTERLEAVED typedef int __bitwise snd_pcm_format_t; -#define SNDRV_PCM_FORMAT_S8 ((__force snd_pcm_format_t) 0) -#define SNDRV_PCM_FORMAT_U8 ((__force snd_pcm_format_t) 1) -#define SNDRV_PCM_FORMAT_S16_LE ((__force snd_pcm_format_t) 2) -#define SNDRV_PCM_FORMAT_S16_BE ((__force snd_pcm_format_t) 3) -#define SNDRV_PCM_FORMAT_U16_LE ((__force snd_pcm_format_t) 4) -#define SNDRV_PCM_FORMAT_U16_BE ((__force snd_pcm_format_t) 5) -#define SNDRV_PCM_FORMAT_S24_LE ((__force snd_pcm_format_t) 6) -#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) -#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) -#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) -#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10) -#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11) -#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12) -#define SNDRV_PCM_FORMAT_U32_BE ((__force snd_pcm_format_t) 13) -#define SNDRV_PCM_FORMAT_FLOAT_LE ((__force snd_pcm_format_t) 14) -#define SNDRV_PCM_FORMAT_FLOAT_BE ((__force snd_pcm_format_t) 15) -#define SNDRV_PCM_FORMAT_FLOAT64_LE ((__force snd_pcm_format_t) 16) -#define SNDRV_PCM_FORMAT_FLOAT64_BE ((__force snd_pcm_format_t) 17) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((__force snd_pcm_format_t) 18) -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((__force snd_pcm_format_t) 19) -#define SNDRV_PCM_FORMAT_MU_LAW ((__force snd_pcm_format_t) 20) -#define SNDRV_PCM_FORMAT_A_LAW ((__force snd_pcm_format_t) 21) -#define SNDRV_PCM_FORMAT_IMA_ADPCM ((__force snd_pcm_format_t) 22) -#define SNDRV_PCM_FORMAT_MPEG ((__force snd_pcm_format_t) 23) -#define SNDRV_PCM_FORMAT_GSM ((__force snd_pcm_format_t) 24) -#define SNDRV_PCM_FORMAT_S20_LE ((__force snd_pcm_format_t) 25) -#define SNDRV_PCM_FORMAT_S20_BE ((__force snd_pcm_format_t) 26) -#define SNDRV_PCM_FORMAT_U20_LE ((__force snd_pcm_format_t) 27) -#define SNDRV_PCM_FORMAT_U20_BE ((__force snd_pcm_format_t) 28) -#define SNDRV_PCM_FORMAT_SPECIAL ((__force snd_pcm_format_t) 31) -#define SNDRV_PCM_FORMAT_S24_3LE ((__force snd_pcm_format_t) 32) -#define SNDRV_PCM_FORMAT_S24_3BE ((__force snd_pcm_format_t) 33) -#define SNDRV_PCM_FORMAT_U24_3LE ((__force snd_pcm_format_t) 34) -#define SNDRV_PCM_FORMAT_U24_3BE ((__force snd_pcm_format_t) 35) -#define SNDRV_PCM_FORMAT_S20_3LE ((__force snd_pcm_format_t) 36) -#define SNDRV_PCM_FORMAT_S20_3BE ((__force snd_pcm_format_t) 37) -#define SNDRV_PCM_FORMAT_U20_3LE ((__force snd_pcm_format_t) 38) -#define SNDRV_PCM_FORMAT_U20_3BE ((__force snd_pcm_format_t) 39) -#define SNDRV_PCM_FORMAT_S18_3LE ((__force snd_pcm_format_t) 40) -#define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) -#define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) -#define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) -#define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) -#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) -#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) -#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) -#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) -#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) -#define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) -#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) -#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) +#define SNDRV_PCM_FORMAT_S8 (( snd_pcm_format_t) 0) +#define SNDRV_PCM_FORMAT_U8 (( snd_pcm_format_t) 1) +#define SNDRV_PCM_FORMAT_S16_LE (( snd_pcm_format_t) 2) +#define SNDRV_PCM_FORMAT_S16_BE (( snd_pcm_format_t) 3) +#define SNDRV_PCM_FORMAT_U16_LE (( snd_pcm_format_t) 4) +#define SNDRV_PCM_FORMAT_U16_BE (( snd_pcm_format_t) 5) +#define SNDRV_PCM_FORMAT_S24_LE (( snd_pcm_format_t) 6) +#define SNDRV_PCM_FORMAT_S24_BE (( snd_pcm_format_t) 7) +#define SNDRV_PCM_FORMAT_U24_LE (( snd_pcm_format_t) 8) +#define SNDRV_PCM_FORMAT_U24_BE (( snd_pcm_format_t) 9) +#define SNDRV_PCM_FORMAT_S32_LE (( snd_pcm_format_t) 10) +#define SNDRV_PCM_FORMAT_S32_BE (( snd_pcm_format_t) 11) +#define SNDRV_PCM_FORMAT_U32_LE (( snd_pcm_format_t) 12) +#define SNDRV_PCM_FORMAT_U32_BE (( snd_pcm_format_t) 13) +#define SNDRV_PCM_FORMAT_FLOAT_LE (( snd_pcm_format_t) 14) +#define SNDRV_PCM_FORMAT_FLOAT_BE (( snd_pcm_format_t) 15) +#define SNDRV_PCM_FORMAT_FLOAT64_LE (( snd_pcm_format_t) 16) +#define SNDRV_PCM_FORMAT_FLOAT64_BE (( snd_pcm_format_t) 17) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( snd_pcm_format_t) 18) +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( snd_pcm_format_t) 19) +#define SNDRV_PCM_FORMAT_MU_LAW (( snd_pcm_format_t) 20) +#define SNDRV_PCM_FORMAT_A_LAW (( snd_pcm_format_t) 21) +#define SNDRV_PCM_FORMAT_IMA_ADPCM (( snd_pcm_format_t) 22) +#define SNDRV_PCM_FORMAT_MPEG (( snd_pcm_format_t) 23) +#define SNDRV_PCM_FORMAT_GSM (( snd_pcm_format_t) 24) +#define SNDRV_PCM_FORMAT_S20_LE (( snd_pcm_format_t) 25) +#define SNDRV_PCM_FORMAT_S20_BE (( snd_pcm_format_t) 26) +#define SNDRV_PCM_FORMAT_U20_LE (( snd_pcm_format_t) 27) +#define SNDRV_PCM_FORMAT_U20_BE (( snd_pcm_format_t) 28) +#define SNDRV_PCM_FORMAT_SPECIAL (( snd_pcm_format_t) 31) +#define SNDRV_PCM_FORMAT_S24_3LE (( snd_pcm_format_t) 32) +#define SNDRV_PCM_FORMAT_S24_3BE (( snd_pcm_format_t) 33) +#define SNDRV_PCM_FORMAT_U24_3LE (( snd_pcm_format_t) 34) +#define SNDRV_PCM_FORMAT_U24_3BE (( snd_pcm_format_t) 35) +#define SNDRV_PCM_FORMAT_S20_3LE (( snd_pcm_format_t) 36) +#define SNDRV_PCM_FORMAT_S20_3BE (( snd_pcm_format_t) 37) +#define SNDRV_PCM_FORMAT_U20_3LE (( snd_pcm_format_t) 38) +#define SNDRV_PCM_FORMAT_U20_3BE (( snd_pcm_format_t) 39) +#define SNDRV_PCM_FORMAT_S18_3LE (( snd_pcm_format_t) 40) +#define SNDRV_PCM_FORMAT_S18_3BE (( snd_pcm_format_t) 41) +#define SNDRV_PCM_FORMAT_U18_3LE (( snd_pcm_format_t) 42) +#define SNDRV_PCM_FORMAT_U18_3BE (( snd_pcm_format_t) 43) +#define SNDRV_PCM_FORMAT_G723_24 (( snd_pcm_format_t) 44) +#define SNDRV_PCM_FORMAT_G723_24_1B (( snd_pcm_format_t) 45) +#define SNDRV_PCM_FORMAT_G723_40 (( snd_pcm_format_t) 46) +#define SNDRV_PCM_FORMAT_G723_40_1B (( snd_pcm_format_t) 47) +#define SNDRV_PCM_FORMAT_DSD_U8 (( snd_pcm_format_t) 48) +#define SNDRV_PCM_FORMAT_DSD_U16_LE (( snd_pcm_format_t) 49) +#define SNDRV_PCM_FORMAT_DSD_U32_LE (( snd_pcm_format_t) 50) +#define SNDRV_PCM_FORMAT_DSD_U16_BE (( snd_pcm_format_t) 51) +#define SNDRV_PCM_FORMAT_DSD_U32_BE (( snd_pcm_format_t) 52) #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE #define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8 #ifdef SNDRV_LITTLE_ENDIAN @@ -212,7 +212,7 @@ typedef int __bitwise snd_pcm_format_t; #define SNDRV_PCM_FORMAT_U20 SNDRV_PCM_FORMAT_U20_BE #endif typedef int __bitwise snd_pcm_subformat_t; -#define SNDRV_PCM_SUBFORMAT_STD ((__force snd_pcm_subformat_t) 0) +#define SNDRV_PCM_SUBFORMAT_STD (( snd_pcm_subformat_t) 0) #define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD #define SNDRV_PCM_INFO_MMAP 0x00000001 #define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 @@ -243,15 +243,15 @@ typedef int __bitwise snd_pcm_subformat_t; #define __SND_STRUCT_TIME64 #endif typedef int __bitwise snd_pcm_state_t; -#define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) -#define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) -#define SNDRV_PCM_STATE_PREPARED ((__force snd_pcm_state_t) 2) -#define SNDRV_PCM_STATE_RUNNING ((__force snd_pcm_state_t) 3) -#define SNDRV_PCM_STATE_XRUN ((__force snd_pcm_state_t) 4) -#define SNDRV_PCM_STATE_DRAINING ((__force snd_pcm_state_t) 5) -#define SNDRV_PCM_STATE_PAUSED ((__force snd_pcm_state_t) 6) -#define SNDRV_PCM_STATE_SUSPENDED ((__force snd_pcm_state_t) 7) -#define SNDRV_PCM_STATE_DISCONNECTED ((__force snd_pcm_state_t) 8) +#define SNDRV_PCM_STATE_OPEN (( snd_pcm_state_t) 0) +#define SNDRV_PCM_STATE_SETUP (( snd_pcm_state_t) 1) +#define SNDRV_PCM_STATE_PREPARED (( snd_pcm_state_t) 2) +#define SNDRV_PCM_STATE_RUNNING (( snd_pcm_state_t) 3) +#define SNDRV_PCM_STATE_XRUN (( snd_pcm_state_t) 4) +#define SNDRV_PCM_STATE_DRAINING (( snd_pcm_state_t) 5) +#define SNDRV_PCM_STATE_PAUSED (( snd_pcm_state_t) 6) +#define SNDRV_PCM_STATE_SUSPENDED (( snd_pcm_state_t) 7) +#define SNDRV_PCM_STATE_DISCONNECTED (( snd_pcm_state_t) 8) #define SNDRV_PCM_STATE_LAST SNDRV_PCM_STATE_DISCONNECTED enum { SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000, @@ -475,12 +475,12 @@ struct __snd_pcm_sync_ptr64 { }; struct snd_xferi { snd_pcm_sframes_t result; - void __user * buf; + void * buf; snd_pcm_uframes_t frames; }; struct snd_xfern { snd_pcm_sframes_t result; - void __user * __user * bufs; + void * * bufs; snd_pcm_uframes_t frames; }; enum { @@ -776,22 +776,22 @@ struct snd_ctl_card_info { unsigned char components[128]; }; typedef int __bitwise snd_ctl_elem_type_t; -#define SNDRV_CTL_ELEM_TYPE_NONE ((__force snd_ctl_elem_type_t) 0) -#define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((__force snd_ctl_elem_type_t) 1) -#define SNDRV_CTL_ELEM_TYPE_INTEGER ((__force snd_ctl_elem_type_t) 2) -#define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((__force snd_ctl_elem_type_t) 3) -#define SNDRV_CTL_ELEM_TYPE_BYTES ((__force snd_ctl_elem_type_t) 4) -#define SNDRV_CTL_ELEM_TYPE_IEC958 ((__force snd_ctl_elem_type_t) 5) -#define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((__force snd_ctl_elem_type_t) 6) +#define SNDRV_CTL_ELEM_TYPE_NONE (( snd_ctl_elem_type_t) 0) +#define SNDRV_CTL_ELEM_TYPE_BOOLEAN (( snd_ctl_elem_type_t) 1) +#define SNDRV_CTL_ELEM_TYPE_INTEGER (( snd_ctl_elem_type_t) 2) +#define SNDRV_CTL_ELEM_TYPE_ENUMERATED (( snd_ctl_elem_type_t) 3) +#define SNDRV_CTL_ELEM_TYPE_BYTES (( snd_ctl_elem_type_t) 4) +#define SNDRV_CTL_ELEM_TYPE_IEC958 (( snd_ctl_elem_type_t) 5) +#define SNDRV_CTL_ELEM_TYPE_INTEGER64 (( snd_ctl_elem_type_t) 6) #define SNDRV_CTL_ELEM_TYPE_LAST SNDRV_CTL_ELEM_TYPE_INTEGER64 typedef int __bitwise snd_ctl_elem_iface_t; -#define SNDRV_CTL_ELEM_IFACE_CARD ((__force snd_ctl_elem_iface_t) 0) -#define SNDRV_CTL_ELEM_IFACE_HWDEP ((__force snd_ctl_elem_iface_t) 1) -#define SNDRV_CTL_ELEM_IFACE_MIXER ((__force snd_ctl_elem_iface_t) 2) -#define SNDRV_CTL_ELEM_IFACE_PCM ((__force snd_ctl_elem_iface_t) 3) -#define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((__force snd_ctl_elem_iface_t) 4) -#define SNDRV_CTL_ELEM_IFACE_TIMER ((__force snd_ctl_elem_iface_t) 5) -#define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((__force snd_ctl_elem_iface_t) 6) +#define SNDRV_CTL_ELEM_IFACE_CARD (( snd_ctl_elem_iface_t) 0) +#define SNDRV_CTL_ELEM_IFACE_HWDEP (( snd_ctl_elem_iface_t) 1) +#define SNDRV_CTL_ELEM_IFACE_MIXER (( snd_ctl_elem_iface_t) 2) +#define SNDRV_CTL_ELEM_IFACE_PCM (( snd_ctl_elem_iface_t) 3) +#define SNDRV_CTL_ELEM_IFACE_RAWMIDI (( snd_ctl_elem_iface_t) 4) +#define SNDRV_CTL_ELEM_IFACE_TIMER (( snd_ctl_elem_iface_t) 5) +#define SNDRV_CTL_ELEM_IFACE_SEQUENCER (( snd_ctl_elem_iface_t) 6) #define SNDRV_CTL_ELEM_IFACE_LAST SNDRV_CTL_ELEM_IFACE_SEQUENCER #define SNDRV_CTL_ELEM_ACCESS_READ (1 << 0) #define SNDRV_CTL_ELEM_ACCESS_WRITE (1 << 1) @@ -826,7 +826,7 @@ struct snd_ctl_elem_list { unsigned int space; unsigned int used; unsigned int count; - struct snd_ctl_elem_id __user * pids; + struct snd_ctl_elem_id * pids; unsigned char reserved[50]; }; struct snd_ctl_elem_info { diff --git a/sysroots/x86_64-unknown-linux-musl/include/xen/gntdev.h b/sysroots/x86_64-unknown-linux-musl/include/xen/gntdev.h index 1e78ac37..eada73c4 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/xen/gntdev.h +++ b/sysroots/x86_64-unknown-linux-musl/include/xen/gntdev.h @@ -55,7 +55,7 @@ struct ioctl_gntdev_unmap_notify { }; struct gntdev_grant_copy_segment { union { - void __user * virt; + void * virt; struct { grant_ref_t ref; __u16 offset; @@ -69,7 +69,7 @@ struct gntdev_grant_copy_segment { #define IOCTL_GNTDEV_GRANT_COPY _IOC(_IOC_NONE, 'G', 8, sizeof(struct ioctl_gntdev_grant_copy)) struct ioctl_gntdev_grant_copy { unsigned int count; - struct gntdev_grant_copy_segment __user * segments; + struct gntdev_grant_copy_segment * segments; }; #define UNMAP_NOTIFY_CLEAR_BYTE 0x1 #define UNMAP_NOTIFY_SEND_EVENT 0x2 diff --git a/sysroots/x86_64-unknown-linux-musl/include/xen/privcmd.h b/sysroots/x86_64-unknown-linux-musl/include/xen/privcmd.h index 145446b4..21d9f840 100644 --- a/sysroots/x86_64-unknown-linux-musl/include/xen/privcmd.h +++ b/sysroots/x86_64-unknown-linux-musl/include/xen/privcmd.h @@ -33,13 +33,13 @@ struct privcmd_mmap_entry { struct privcmd_mmap { int num; domid_t dom; - struct privcmd_mmap_entry __user * entry; + struct privcmd_mmap_entry * entry; }; struct privcmd_mmapbatch { int num; domid_t dom; __u64 addr; - xen_pfn_t __user * arr; + xen_pfn_t * arr; }; #define PRIVCMD_MMAPBATCH_MFN_ERROR 0xf0000000U #define PRIVCMD_MMAPBATCH_PAGED_ERROR 0x80000000U @@ -47,17 +47,17 @@ struct privcmd_mmapbatch_v2 { unsigned int num; domid_t dom; __u64 addr; - const xen_pfn_t __user * arr; - int __user * err; + const xen_pfn_t * arr; + int * err; }; struct privcmd_dm_op_buf { - void __user * uptr; + void * uptr; size_t size; }; struct privcmd_dm_op { domid_t dom; __u16 num; - const struct privcmd_dm_op_buf __user * ubufs; + const struct privcmd_dm_op_buf * ubufs; }; struct privcmd_mmap_resource { domid_t dom; diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crt1.o b/sysroots/x86_64-unknown-linux-musl/lib/crt1.o Binary files differindex 4e3be129..046b7647 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/crt1.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crt1.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crtbegin.o b/sysroots/x86_64-unknown-linux-musl/lib/crtbegin.o Binary files differindex 03a3c4a5..a1f0db96 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/crtbegin.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crtbegin.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crtbeginS.o b/sysroots/x86_64-unknown-linux-musl/lib/crtbeginS.o Binary files differindex 03a3c4a5..a1f0db96 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/crtbeginS.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crtbeginS.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crtbeginT.o b/sysroots/x86_64-unknown-linux-musl/lib/crtbeginT.o Binary files differindex 03a3c4a5..a1f0db96 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/crtbeginT.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crtbeginT.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crtend.o b/sysroots/x86_64-unknown-linux-musl/lib/crtend.o Binary files differindex a2caaf72..c96e258c 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/crtend.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crtend.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crtendS.o b/sysroots/x86_64-unknown-linux-musl/lib/crtendS.o Binary files differindex a2caaf72..c96e258c 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/crtendS.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crtendS.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crti.o b/sysroots/x86_64-unknown-linux-musl/lib/crti.o Binary files differindex 094f409f..f07f2b65 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/crti.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crti.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/crtn.o b/sysroots/x86_64-unknown-linux-musl/lib/crtn.o Binary files differindex 78dad719..d8ef2d4f 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/crtn.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/crtn.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libc++.a b/sysroots/x86_64-unknown-linux-musl/lib/libc++.a Binary files differindex 20f1c4a5..b081a7e2 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/libc++.a +++ b/sysroots/x86_64-unknown-linux-musl/lib/libc++.a diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libc++.so b/sysroots/x86_64-unknown-linux-musl/lib/libc++.so Binary files differindex 5bd3581c..8a0f0198 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/libc++.so +++ b/sysroots/x86_64-unknown-linux-musl/lib/libc++.so diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libc++abi.a b/sysroots/x86_64-unknown-linux-musl/lib/libc++abi.a Binary files differindex dd0f1554..27858e7e 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/libc++abi.a +++ b/sysroots/x86_64-unknown-linux-musl/lib/libc++abi.a diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libc.a b/sysroots/x86_64-unknown-linux-musl/lib/libc.a Binary files differindex a5b2557a..cfcfebc5 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/libc.a +++ b/sysroots/x86_64-unknown-linux-musl/lib/libc.a diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libc_musl.so b/sysroots/x86_64-unknown-linux-musl/lib/libc_musl.so Binary files differindex e8ec0e5a..c372fbd1 100755 --- a/sysroots/x86_64-unknown-linux-musl/lib/libc_musl.so +++ b/sysroots/x86_64-unknown-linux-musl/lib/libc_musl.so diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libc_musl_linker_object.o b/sysroots/x86_64-unknown-linux-musl/lib/libc_musl_linker_object.o Binary files differindex a221536b..52ac456f 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/libc_musl_linker_object.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/libc_musl_linker_object.o diff --git a/sysroots/x86_64-unknown-linux-musl/lib/libz.a b/sysroots/x86_64-unknown-linux-musl/lib/libz.a Binary files differindex 8fb0db14..ffaff2b0 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/libz.a +++ b/sysroots/x86_64-unknown-linux-musl/lib/libz.a diff --git a/sysroots/x86_64-unknown-linux-musl/lib/rcrt1.o b/sysroots/x86_64-unknown-linux-musl/lib/rcrt1.o Binary files differindex 48370a9f..1dc04999 100644 --- a/sysroots/x86_64-unknown-linux-musl/lib/rcrt1.o +++ b/sysroots/x86_64-unknown-linux-musl/lib/rcrt1.o |