Author: arekm Date: Wed Aug 24 13:58:10 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- const fixes
---- Files affected:
packages/kernel:
kernel-grsec_fixes.patch (1.23 -> 1.24)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.23
packages/kernel/kernel-grsec_fixes.patch:1.24
--- packages/kernel/kernel-grsec_fixes.patch:1.23 Wed Aug 24 11:23:07 2011
+++ packages/kernel/kernel-grsec_fixes.patch Wed Aug 24 15:58:05 2011
@@ -127,7 +127,122 @@
{
struct dvb_device *dvbdev;
- struct file_operations *dvbdevfops;
-+ struct file_operations_no_const *dvbdevfops;
++ file_operations_no_const *dvbdevfops;
struct device *clsdev;
int minor;
int id;
+--- linux-3.0/drivers/media/dvb/dvb-core/dvb_demux.h~ 2011-08-24
15:24:31.000000000 +0200
++++ linux-3.0/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24
15:26:03.384849939 +0200
+@@ -68,12 +68,12 @@
+ union {
+ struct dmx_ts_feed ts;
+ struct dmx_section_feed sec;
+- } feed;
++ } __no_const feed;
+
+ union {
+ dmx_ts_cb ts;
+ dmx_section_cb sec;
+- } cb;
++ } __no_const cb;
+
+ struct dvb_demux *demux;
+ void *priv;
+
+--- linux-3.0/include/media/v4l2-ioctl.h.org 2011-08-24 15:35:57.122909533
+0200
++++ linux-3.0/include/media/v4l2-ioctl.h 2011-08-24 15:35:20.495331557
+0200
+@@ -272,6 +272,7 @@
+ long (*vidioc_default) (struct file *file, void *fh,
+ bool valid_prio, int cmd, void *arg);
+ };
++typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
+
+
+ /* v4l debugging and diagnostics */
+--- linux-3.0/include/media/saa7146_vv.h.org 2011-08-24 15:37:02.221195169
+0200
++++ linux-3.0/include/media/saa7146_vv.h 2011-08-24 15:34:23.920591283
+0200
+@@ -163,7 +163,7 @@
+ int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
+
+ /* the extension can override this */
+- struct v4l2_ioctl_ops ops;
++ v4l2_ioctl_ops_no_const ops;
+ /* pointer to the saa7146 core ops */
+ const struct v4l2_ioctl_ops *core_ops;
+
+--- linux-3.0/drivers/media/dvb/dvb-usb/cxusb.c~ 2011-07-22
04:17:23.000000000 +0200
++++ linux-3.0/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-24
15:40:27.459629659 +0200
+@@ -1059,7 +1059,7 @@
+ struct dib0700_adapter_state {
+ int (*set_param_save) (struct dvb_frontend *,
+ struct dvb_frontend_parameters *);
+-};
++} __no_const;
+
+ static int dib7070_set_param_override(struct dvb_frontend *fe,
+ struct dvb_frontend_parameters *fep)
+--- linux-3.0/drivers/media/dvb/frontends/dib3000.h~ 2011-07-22
04:17:23.000000000 +0200
++++ linux-3.0/drivers/media/dvb/frontends/dib3000.h 2011-08-24
15:43:35.010954191 +0200
+@@ -40,6 +40,7 @@
+ int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
+ int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
+ };
++typedef struct dib_fe_xfer_ops __no_const dib_fe_xfer_ops_no_const;
+
+ #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) &&
defined(MODULE))
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config*
config,
+--- linux-3.0/drivers/media/dvb/dvb-usb/dibusb.h.org 2011-08-24
15:44:18.638705537 +0200
++++ linux-3.0/drivers/media/dvb/dvb-usb/dibusb.h 2011-08-24
15:44:29.398971130 +0200
+@@ -97,7 +97,7 @@
+ #define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02
+
+ struct dibusb_state {
+- struct dib_fe_xfer_ops ops;
++ dib_fe_xfer_ops_no_const ops;
+ int mt2060_present;
+ u8 tuner_addr;
+ };
+--- linux-3.0/drivers/media/dvb/dvb-usb/dw2102.c~ 2011-07-22
04:17:23.000000000 +0200
++++ linux-3.0/drivers/media/dvb/dvb-usb/dw2102.c 2011-08-24
15:47:08.916263060 +0200
+@@ -95,7 +95,7 @@
+
+ struct s6x0_state {
+ int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
+-};
++} __no_const ;
+
+ /* debug */
+ static int dvb_usb_dw2102_debug;
+--- linux-3.0/drivers/media/dvb/frontends/dib3000.h~ 2011-08-24
15:43:35.000000000 +0200
++++ linux-3.0/drivers/media/dvb/frontends/dib3000.h 2011-08-24
15:48:48.682071857 +0200
+@@ -44,7 +44,7 @@
+
+ #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) &&
defined(MODULE))
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config*
config,
+- struct i2c_adapter* i2c, struct
dib_fe_xfer_ops *xfer_ops);
++ struct i2c_adapter* i2c,
dib_fe_xfer_ops_no_const *xfer_ops);
+ #else
+ static inline struct dvb_frontend* dib3000mb_attach(const struct
dib3000_config* config,
+ struct i2c_adapter* i2c, struct
dib_fe_xfer_ops *xfer_ops)
+--- linux-3.0/drivers/media/dvb/frontends/dib3000mb.c~ 2011-07-22
04:17:23.000000000 +0200
++++ linux-3.0/drivers/media/dvb/frontends/dib3000mb.c 2011-08-24
15:48:25.304824157 +0200
+@@ -756,7 +756,7 @@
+ static struct dvb_frontend_ops dib3000mb_ops;
+
+ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+- struct i2c_adapter* i2c, struct
dib_fe_xfer_ops *xfer_ops)
++ struct i2c_adapter* i2c,
dib_fe_xfer_ops_no_const *xfer_ops)
+ {
+ struct dib3000_state* state = NULL;
+
+--- linux-3.0/drivers/media/video/timblogiw.c~ 2011-07-22 04:17:23.000000000
+0200
++++ linux-3.0/drivers/media/video/timblogiw.c 2011-08-24 15:51:45.306448917
+0200
+@@ -745,7 +745,7 @@
+
+ /* Platform device functions */
+
+-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
++static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
+ .vidioc_querycap = timblogiw_querycap,
+ .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
+ .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.23&r2=1.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
