There is a (inconsequential) typo in drivers/block/raid0.c. The following
patch fixes that (first hunk) and deletes a few unused variables all over
the place. There are many assembler warnings left:
Warning: using `%eax' instead of `%ax' due to `l' suffix
Warning: indirect lcall without `*'
(Still catering for old binutils?), and the by now infamous:
Warning: Ignoring changed section attributes for .modinfo
There is also a:
Warning: using `%bx' instead of `%ebx' due to `w' suffix
due to inline asm in _set_tssldt_desc inside of arch/i386/kernel/traps.c. I
propose the change below to clean this up. At first sight I thought some
instructions where just fillers as they did not take any ouside args. The
resulting .s file is identical to the one given by the original here, so I
assume it is OK. Note that I relaxed/thightened some constraints to asm()
arguments in the process.
--- linux-2.2.17pre/fs/isofs/joliet.c.dist-2.2.17pre9 Wed Jun 7 17:26:43 2000
+++ linux-2.2.17pre/fs/isofs/joliet.c Sat Jul 1 23:28:05 2000
@@ -19,8 +19,6 @@
struct nls_table *nls)
{
unsigned char *ip, *op;
- unsigned char ch, cl;
- unsigned char *uni_page;
ip = uni;
op = ascii;
--- linux-2.2.17pre/fs/fat/dir.c.dist-2.2.17pre9 Sat Jul 1 23:25:33 2000
+++ linux-2.2.17pre/fs/fat/dir.c Sat Jul 1 23:25:43 2000
@@ -68,7 +68,6 @@
struct nls_table *nls)
{
unsigned char *ip, *op;
- unsigned char ch, cl;
unsigned short val;
ip = uni;
--- linux-2.2.17pre/drivers/net/8390.c.dist-2.2.17pre9 Tue Oct 26 21:53:40 1999
+++ linux-2.2.17pre/drivers/net/8390.c Sat Jul 1 23:16:11 2000
@@ -176,7 +176,6 @@
/* Opposite of above. Only used when "ifconfig <devname> down" is done. */
int ei_close(struct device *dev)
{
- struct ei_device *ei_local = (struct ei_device *) dev->priv;
unsigned long flags;
/*
@@ -975,7 +974,6 @@
static void set_multicast_list(struct device *dev)
{
unsigned long flags;
- struct ei_device *ei_local = (struct ei_device*)dev->priv;
spin_lock_irqsave(&ei_local->page_lock, flags);
do_set_multicast_list(dev);
@@ -1089,7 +1087,6 @@
int start_page)
{
long e8390_base = dev->base_addr;
- struct ei_device *ei_local = (struct ei_device *) dev->priv;
outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
--- linux-2.2.17pre/drivers/block/raid0.c.dist-2.2.17pre9 Tue Jan 4 15:12:14 2000
+++ linux-2.2.17pre/drivers/block/raid0.c Sat Jul 1 23:06:26 2000
@@ -184,7 +184,7 @@
if (hash - data->hash_table > data->nr_zones)
{
- printk(KERN_DEBUG "raid0_map: invalid block %ul\n", block);
+ printk(KERN_DEBUG "raid0_map: invalid block %lu\n", block);
return -1;
}
--- linux-2.2.17pre/arch/i386/kernel/setup.c.dist-2.2.17pre9 Tue Jun 27 20:45:06 2000
+++ linux-2.2.17pre/arch/i386/kernel/setup.c Sat Jul 1 23:00:05 2000
@@ -759,7 +759,7 @@
__initfunc(static void transmeta_model(struct cpuinfo_x86 *c))
{
- unsigned int cap_mask, uk, max, dummy, n, ecx, edx;
+ unsigned int cap_mask, uk, max, dummy;
unsigned int cms_rev1, cms_rev2;
unsigned int cpu_rev, cpu_freq, cpu_flags;
char cpu_info[65];
--- linux-2.2.17pre/arch/i386/kernel/traps.c.dist-2.2.17pre9 Tue Jun 27 20:45:06 2000
+++ linux-2.2.17pre/arch/i386/kernel/traps.c Sun Jul 2 01:03:16 2000
@@ -521,12 +521,13 @@
#define _set_gate(gate_addr,type,dpl,addr) \
do { \
int __d0, __d1; \
- __asm__ __volatile__ ("movw %%dx,%%ax\n\t" \
- "movw %4,%%dx\n\t" \
- "movl %%eax,%0\n\t" \
- "movl %%edx,%1" \
+ __asm__ __volatile__ ( \
+ "movw %w3,%w2\n\t" \
+ "movw %w4,%w3\n\t" \
+ "movl %2,%0\n\t" \
+ "movl %3,%1" \
:"=m" (*((long *) (gate_addr))), \
- "=m" (*(1+(long *) (gate_addr))), "=&a" (__d0), "=&d" (__d1) \
+ "=m" (*(1+(long *) (gate_addr))), "=&q" (__d0), "=&q" (__d1) \
:"i" ((short) (0x8000+(dpl<<13)+(type<<8))), \
"3" ((char *) (addr)),"2" (__KERNEL_CS << 16)); \
} while (0)
@@ -569,15 +570,16 @@
((limit) & 0x0ffff); }
#define _set_tssldt_desc(n,addr,limit,type) \
-__asm__ __volatile__ ("movw %3,0(%2)\n\t" \
- "movw %%ax,2(%2)\n\t" \
- "rorl $16,%%eax\n\t" \
- "movb %%al,4(%2)\n\t" \
- "movb %4,5(%2)\n\t" \
+__asm__ __volatile__ ( \
+ "movw %w3,0(%2)\n\t" \
+ "movw %w2,2(%2)\n\t" \
+ "rorl $16,%1\n\t" \
+ "movb %b2,4(%2)\n\t" \
+ "movb %b4,5(%2)\n\t" \
"movb $0,6(%2)\n\t" \
- "movb %%ah,7(%2)\n\t" \
- "rorl $16,%%eax" \
- : "=m"(*(n)) : "a" (addr), "r"(n), "ir"(limit), "i"(type))
+ "movb %h2,7(%2)\n\t" \
+ "rorl $16,%1" \
+ : "=m"(*(n)) : "q" (addr), "q"(n), "Lq"(limit), "N"(type))
void set_tss_desc(unsigned int n, void *addr)
{
-- Horst von Brand vonbrand@sleipnir.valparaiso.cl Casilla 9G, Vin~a del Mar, Chile +56 32 672616- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Jul 07 2000 - 21:00:10 EST