5 files changed, 10 insertions, 14 deletions

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d68ddbe70f73..c78ff26647ee 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -129,7 +129,7 @@ $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 
 ifdef GENERATE_KEYMAP
 
-$(obj)/defkeymap.c $(obj)/%.c: $(src)/%.map
+$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
         loadkeys --mktable $< > $@.tmp
         sed -e 's/^static *//' $@.tmp > $@
         rm $@.tmp
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index a5d0e95a227a..141ca176c397 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,11 +506,6 @@ static void intel_i830_init_gtt_entries(void)
                         break;
                 }
         } else {
-                /* G33's GTT stolen memory is separate from gfx data
-                 * stolen memory.
-                 */
-                if (IS_G33)
-                        size = 0;
                 switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
                 case I855_GMCH_GMS_STOLEN_1M:
                         gtt_entries = MB(1) - KB(size);
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 0289705967de..cd406416effd 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -98,9 +98,9 @@ struct smm_regs {
         unsigned int edi __attribute__ ((packed));
 };
 
-static inline char *i8k_get_dmi_data(int field)
+static inline const char *i8k_get_dmi_data(int field)
 {
-        char *dmi_data = dmi_get_system_info(field);
+        const char *dmi_data = dmi_get_system_info(field);
 
         return dmi_data && *dmi_data ? dmi_data : "?";
 }
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 1dd3a065f57b..a2894d425153 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1965,10 +1965,10 @@ struct dmi_ipmi_data
         u8              slave_addr;
 };
 
-static int __devinit decode_dmi(struct dmi_header *dm,
+static int __devinit decode_dmi(const struct dmi_header *dm,
                                 struct dmi_ipmi_data *dmi)
 {
-        u8              *data = (u8 *)dm;
+        const u8        *data = (const u8 *)dm;
         unsigned long   base_addr;
         u8              reg_spacing;
         u8              len = dm->length;
@@ -2091,13 +2091,14 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
 
 static void __devinit dmi_find_bmc(void)
 {
-        struct dmi_device    *dev = NULL;
+        const struct dmi_device *dev = NULL;
         struct dmi_ipmi_data data;
         int                  rv;
 
         while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
                 memset(&data, 0, sizeof(data));
-                rv = decode_dmi((struct dmi_header *) dev->device_data, &data);
+                rv = decode_dmi((const struct dmi_header *) dev->device_data,
+                                &data);
                 if (!rv)
                         try_init_dmi(&data);
         }
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index c799b7f7bbb3..7a61a2a9aafe 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -1032,7 +1032,7 @@ static DECLARE_WAIT_QUEUE_HEAD(vt_activate_queue);
 
 /*
  * Sleeps until a vt is activated, or the task is interrupted. Returns
- * 0 if activation, -EINTR if interrupted.
+ * 0 if activation, -EINTR if interrupted by a signal handler.
  */
 int vt_waitactive(int vt)
 {
@@ -1057,7 +1057,7 @@ int vt_waitactive(int vt)
                         break;
                 }
                 release_console_sem();
-                retval = -EINTR;
+                retval = -ERESTARTNOHAND;
                 if (signal_pending(current))
                         break;
                 schedule();