summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/capi.h2
-rw-r--r--include/linux/dvb/osd.h2
-rw-r--r--include/linux/dvb/video.h2
-rw-r--r--include/linux/isdnif.h12
-rw-r--r--include/linux/kernelcapi.h2
-rw-r--r--include/linux/pkt_sched.h30
-rw-r--r--include/linux/reiserfs_fs.h2
-rw-r--r--include/linux/videodev.h2
-rw-r--r--include/linux/videodev2.h4
-rw-r--r--include/linux/videotext.h2
-rw-r--r--include/linux/xfrm.h9
11 files changed, 21 insertions, 48 deletions
diff --git a/include/linux/capi.h b/include/linux/capi.h
index 501ea6d59ae6..fdebaaa9f66e 100644
--- a/include/linux/capi.h
+++ b/include/linux/capi.h
@@ -77,7 +77,7 @@ typedef struct capi_profile {
typedef struct capi_manufacturer_cmd {
unsigned long cmd;
- void *data;
+ void __user *data;
} capi_manufacturer_cmd;
/*
diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h
index 0d8143960a19..5ccf27457e1b 100644
--- a/include/linux/dvb/osd.h
+++ b/include/linux/dvb/osd.h
@@ -101,7 +101,7 @@ typedef struct osd_cmd_s {
int x1;
int y1;
int color;
- void *data;
+ void __user *data;
} osd_cmd_t;
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 09a4286fb02b..8fb2eb336336 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -100,7 +100,7 @@ struct video_status {
struct video_still_picture {
- char *iFrame; /* pointer to a single iframe in memory */
+ char __user *iFrame; /* pointer to a single iframe in memory */
int32_t size;
};
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index 823e516b14a2..7a4eacd77cb2 100644
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -502,26 +502,18 @@ typedef struct {
* Parameters:
* u_char pointer data
* int length of data
- * int Flag: 0 = Call form Kernel-Space (use memcpy,
- * no schedule allowed)
- * 1 = Data is in User-Space (use memcpy_fromfs,
- * may schedule)
* int driverId
* int local channel-number (0 ...)
*/
- int (*writecmd)(const u_char*, int, int, int, int);
+ int (*writecmd)(const u_char __user *, int, int, int);
/* Read raw Status replies
* u_char pointer data (volatile)
* int length of buffer
- * int Flag: 0 = Call form Kernel-Space (use memcpy,
- * no schedule allowed)
- * 1 = Data is in User-Space (use memcpy_fromfs,
- * may schedule)
* int driverId
* int local channel-number (0 ...)
*/
- int (*readstat)(u_char*, int, int, int, int);
+ int (*readstat)(u_char __user *, int, int, int);
char id[20];
} isdn_if;
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index 1d4b1b15d0b8..891bb2cf0aa8 100644
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -81,7 +81,7 @@ u16 capi20_get_manufacturer(u32 contr, u8 buf[CAPI_MANUFACTURER_LEN]);
u16 capi20_get_version(u32 contr, struct capi_version *verp);
u16 capi20_get_serial(u32 contr, u8 serial[CAPI_SERIAL_LEN]);
u16 capi20_get_profile(u32 contr, struct capi_profile *profp);
-int capi20_manufacturer(unsigned int cmd, void *data);
+int capi20_manufacturer(unsigned int cmd, void __user *data);
/* temporary hack XXX */
void capi20_set_callback(struct capi20_appl *ap,
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index a0654045d9d8..d98d8cfcd08d 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -100,34 +100,6 @@ struct tc_prio_qopt
__u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
};
-/* CSZ section */
-
-struct tc_csz_qopt
-{
- int flows; /* Maximal number of guaranteed flows */
- unsigned char R_log; /* Fixed point position for round number */
- unsigned char delta_log; /* Log of maximal managed time interval */
- __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> CSZ band */
-};
-
-struct tc_csz_copt
-{
- struct tc_ratespec slice;
- struct tc_ratespec rate;
- struct tc_ratespec peakrate;
- __u32 limit;
- __u32 buffer;
- __u32 mtu;
-};
-
-enum
-{
- TCA_CSZ_UNSPEC,
- TCA_CSZ_PARMS,
- TCA_CSZ_RTAB,
- TCA_CSZ_PTAB,
-};
-
/* TBF section */
struct tc_tbf_qopt
@@ -437,6 +409,6 @@ struct tc_netem_qopt
__u32 loss; /* random packet loss (0=none ~0=100%) */
__u32 gap; /* re-ordering gap (0 for delay all) */
__u32 duplicate; /* random packet dup (0=none ~0=100%) */
- __u32 rate; /* maximum transmit rate (bytes/sec) */
+ __u32 jitter; /* random jitter in latency (us) */
};
#endif
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 813868e0eb62..ad6b8bd97822 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -81,7 +81,7 @@ void reiserfs_warning (struct super_block *s, const char * fmt, ...);
/** always check a condition and panic if it's false. */
#define RASSERT( cond, format, args... ) \
if( !( cond ) ) \
- reiserfs_panic( 0, "reiserfs[%i]: assertion " #cond " failed at " \
+ reiserfs_panic( NULL, "reiserfs[%i]: assertion " #cond " failed at " \
__FILE__ ":%i:%s: " format "\n", \
in_interrupt() ? -1 : current -> pid, __LINE__ , __FUNCTION__ , ##args )
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index cfcf6f1cd0e2..0800884ef67c 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -222,7 +222,7 @@ struct video_window
__u32 width,height; /* Its size */
__u32 chromakey;
__u32 flags;
- struct video_clip *clips; /* Set only */
+ struct video_clip __user *clips; /* Set only */
int clipcount;
#define VIDEO_WINDOW_INTERLACE 1
#define VIDEO_WINDOW_CHROMAKEY 16 /* Overlay by chromakey */
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index ab8727d92739..076dd41d5b6e 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -433,9 +433,9 @@ struct v4l2_window
struct v4l2_rect w;
enum v4l2_field field;
__u32 chromakey;
- struct v4l2_clip *clips;
+ struct v4l2_clip __user *clips;
__u32 clipcount;
- void *bitmap;
+ void __user *bitmap;
};
diff --git a/include/linux/videotext.h b/include/linux/videotext.h
index 78faf6afea70..ab778ef2544f 100644
--- a/include/linux/videotext.h
+++ b/include/linux/videotext.h
@@ -71,7 +71,7 @@ typedef struct
int pgbuf; /* buffer where page will be stored */
int start; /* start of requested part of page */
int end; /* end of requested part of page */
- void *buffer; /* pointer to beginning of destination buffer */
+ void __user *buffer; /* pointer to beginning of destination buffer */
}
vtx_pagereq_t;
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 79b5ab2a7b21..2e22a996f623 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -135,6 +135,11 @@ enum {
XFRM_MSG_POLEXPIRE,
#define XFRM_MSG_POLEXPIRE XFRM_MSG_POLEXPIRE
+ XFRM_MSG_FLUSHSA,
+#define XFRM_MSG_FLUSHSA XFRM_MSG_FLUSHSA
+ XFRM_MSG_FLUSHPOLICY,
+#define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY
+
XFRM_MSG_MAX
};
@@ -242,6 +247,10 @@ struct xfrm_user_polexpire {
__u8 hard;
};
+struct xfrm_usersa_flush {
+ __u8 proto;
+};
+
#define XFRMGRP_ACQUIRE 1
#define XFRMGRP_EXPIRE 2
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-14 00:45:34 +0000