[parisc-linux-cvs] 2.5.70-pa5: some fixes
Helge Deller
deller@gmx.de
Sun, 1 Jun 2003 13:16:51 +0200
--Boundary-00=_jCe2+hvQU2RXClM
Content-Type: text/plain;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
On Sunday 01 June 2003 13:14, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux-2.5
> Changes by: deller 03/06/01 05:14:23
>
> Modified files:
> . : Makefile
> arch/parisc/kernel: module.c pdc_cons.c
> drivers/input/mouse: hil_ptr.c
> drivers/video/console: sticore.c
>
> Log message:
> 2.5.70-pa5:
> - module.c: #ifdef out some functions which are not used for 32bit modules
> - pdc_cons.c: try to fix PDC console, SERIAL_MUX is BROKEN !!
> - sticore.c: EXPORT_SYMBOL(sti_get_rom)
--Boundary-00=_jCe2+hvQU2RXClM
Content-Type: text/plain;
charset="iso-8859-15";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- Makefile 1 Jun 2003 03:57:34 -0000 1.117
+++ Makefile 1 Jun 2003 11:12:03 -0000
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 5
SUBLEVEL = 70
-EXTRAVERSION = -pa4
+EXTRAVERSION = -pa5
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
Index: arch/parisc/kernel/module.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/module.c,v
retrieving revision 1.11
diff -u -p -r1.11 module.c
--- arch/parisc/kernel/module.c 1 Jun 2003 03:57:00 -0000 1.11
+++ arch/parisc/kernel/module.c 1 Jun 2003 11:12:04 -0000
@@ -247,6 +247,7 @@ int module_frob_arch_sections(CONST Elf_
return 0;
}
+#ifdef __LP64__
static Elf_Addr get_got(struct module *me, unsigned long value, long addend)
{
unsigned int i;
@@ -264,7 +265,9 @@ static Elf_Addr get_got(struct module *m
got[i].addr = value;
return i * sizeof(struct got_entry);
}
+#endif /* __LP64__ */
+#ifdef __LP64__
static Elf_Addr get_fdesc(struct module *me, unsigned long value)
{
struct fdesc_entry *fdesc = me->module_core + me->arch.fdesc_offset;
@@ -286,6 +289,7 @@ static Elf_Addr get_fdesc(struct module
fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
return (Elf_Addr)fdesc;
}
+#endif /* __LP64__ */
static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,
int millicode)
Index: arch/parisc/kernel/pdc_cons.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/pdc_cons.c,v
retrieving revision 1.9
diff -u -p -r1.9 pdc_cons.c
--- arch/parisc/kernel/pdc_cons.c 8 Nov 2002 15:28:14 -0000 1.9
+++ arch/parisc/kernel/pdc_cons.c 1 Jun 2003 11:12:04 -0000
@@ -24,6 +24,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/major.h>
+#include <linux/tty.h>
#include <asm/page.h>
#include <asm/types.h>
#include <asm/system.h>
@@ -52,12 +53,24 @@ static int pdc_console_setup(struct cons
return 0;
}
-#if defined(CONFIG_PDC_CONSOLE) || defined(CONFIG_SERIAL_MUX)
+#if defined(CONFIG_PDC_CONSOLE)
#define PDC_CONSOLE_DEVICE pdc_console_device
-static kdev_t pdc_console_device (struct console *c)
+static struct tty_driver * pdc_console_device (struct console *c, int *index)
+{
+ extern struct tty_driver console_driver;
+ *index = c->index ? c->index-1 : fg_console;
+ return &console_driver;
+}
+
+#elif defined(CONFIG_SERIAL_MUX)
+#warning CONFIG_SERIAL_MUX
+#define PDC_CONSOLE_DEVICE pdc_console_device
+#warning "FIXME - should be: static struct tty_driver * pdc_console_device (struct console *c, int *index)"
+static kdev_t pdc_console_device (struct console *c, int *index)
{
return mk_kdev(MUX_MAJOR, 0);
}
+
#else
#define PDC_CONSOLE_DEVICE NULL
#endif
Index: drivers/input/mouse/hil_ptr.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/input/mouse/hil_ptr.c,v
retrieving revision 1.3
diff -u -p -r1.3 hil_ptr.c
--- drivers/input/mouse/hil_ptr.c 27 May 2003 23:22:59 -0000 1.3
+++ drivers/input/mouse/hil_ptr.c 1 Jun 2003 11:12:04 -0000
@@ -40,7 +40,7 @@
#include <linux/slab.h>
#define PREFIX "HIL PTR: "
-#define HIL_GENERIC_NAME "generic HIL pointer device"
+#define HIL_GENERIC_NAME "HIL pointer device"
MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver");
@@ -371,11 +371,10 @@ static void hil_ptr_connect(struct serio
ptr->dev.id.version = 0x0100; /* TODO: get from ptr->rsc */
input_register_device(&ptr->dev);
-#warning TODO Boottime printk needs update, as well as dev.name.
- printk(KERN_INFO "input: %s, %s on hil%d\n",
- ptr->dev.name,
+ printk(KERN_INFO "input: %s, %s, ID: %d\n",
+ ptr->dev.name,
(btntype == BTN_MOUSE) ? "HIL mouse":"HIL tablet or touchpad",
- 0);
+ did);
return;
bail1:
Index: drivers/video/console/sticore.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/video/console/sticore.c,v
retrieving revision 1.12
diff -u -p -r1.12 sticore.c
--- drivers/video/console/sticore.c 27 May 2003 17:26:34 -0000 1.12
+++ drivers/video/console/sticore.c 1 Jun 2003 11:12:05 -0000
@@ -1076,3 +1076,6 @@ struct sti_struct * sti_get_rom(unsigned
return sti_roms[index-1];
}
+
+EXPORT_SYMBOL(sti_get_rom);
+
--Boundary-00=_jCe2+hvQU2RXClM--