Commit c1b80063 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] 2.5.6-pre2 I: 2.2.19-pre2 SYNC

	This set of one-liners are the ones which have already gone
into 2.2.19-pre2.

Andrey Panin <pazke@orbita1.ru>: [PATCH] arch_i386_kernel_smpboot.c missing __init:
  this patch adds missing __init directive for div64() function
  in arch/i386/kernel/smpboot.c. div64() is only used
  synchronize_tsc_bp() function which is marked __init.

Andrey Panin <pazke@orbita1.ru>: [PATCH] remove annoying ISAPNP message:
  This patch removes useless messages like:
  "isapnp: Calling quirk for 02:00".

John Fremlin <john@fremlin.de>: Patch to fix off by one in ide-scsi:
  Patch to fix off by one in ide-scsi

  To see it is correct compare with ide-cd behaviour

René Scharfe <l.s.r@web.de>: [PATCH] compiler warnings in scripts_tkgen.c:
  this patch fixes two compiler warnings during make xconfig which
  turn up if one uses -Wshadow
parent 9e1a760d
...@@ -240,7 +240,7 @@ extern unsigned long fast_gettimeoffset_quotient; ...@@ -240,7 +240,7 @@ extern unsigned long fast_gettimeoffset_quotient;
* ^---- (this multiplication can overflow) * ^---- (this multiplication can overflow)
*/ */
static unsigned long long div64 (unsigned long long a, unsigned long b0) static unsigned long long __init div64 (unsigned long long a, unsigned long b0)
{ {
unsigned int a1, a2; unsigned int a1, a2;
unsigned long long res; unsigned long long res;
......
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
#include <linux/isapnp.h> #include <linux/isapnp.h>
#include <linux/string.h> #include <linux/string.h>
#if 0
#define ISAPNP_DEBUG
#endif
static void __init quirk_awe32_resources(struct pci_dev *dev) static void __init quirk_awe32_resources(struct pci_dev *dev)
{ {
struct isapnp_port *port, *port2, *port3; struct isapnp_port *port, *port2, *port3;
...@@ -139,8 +143,10 @@ void isapnp_fixup_device(struct pci_dev *dev) ...@@ -139,8 +143,10 @@ void isapnp_fixup_device(struct pci_dev *dev)
while (isapnp_fixups[i].vendor != 0) { while (isapnp_fixups[i].vendor != 0) {
if ((isapnp_fixups[i].vendor == dev->vendor) && if ((isapnp_fixups[i].vendor == dev->vendor) &&
(isapnp_fixups[i].device == dev->device)) { (isapnp_fixups[i].device == dev->device)) {
#ifdef ISAPNP_DEBUG
printk(KERN_DEBUG "isapnp: Calling quirk for %02x:%02x\n", printk(KERN_DEBUG "isapnp: Calling quirk for %02x:%02x\n",
dev->bus->number, dev->devfn); dev->bus->number, dev->devfn);
#endif
isapnp_fixups[i].quirk_function(dev); isapnp_fixups[i].quirk_function(dev);
} }
i++; i++;
......
...@@ -48,7 +48,7 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti ...@@ -48,7 +48,7 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti
if (ti->cdti_trk1 == ntracks) if (ti->cdti_trk1 == ntracks)
ti->cdti_trk1 = CDROM_LEADOUT; ti->cdti_trk1 = CDROM_LEADOUT;
else else if (ti->cdti_trk1 != CDROM_LEADOUT)
ti->cdti_trk1 ++; ti->cdti_trk1 ++;
trk0_te.cdte_track = ti->cdti_trk0; trk0_te.cdte_track = ti->cdti_trk0;
......
...@@ -620,11 +620,11 @@ void generate_if( struct kconfig * cfg, struct condition * ocond, ...@@ -620,11 +620,11 @@ void generate_if( struct kconfig * cfg, struct condition * ocond,
case token_int: case token_int:
if ( cfg->value && *cfg->value == '$' ) if ( cfg->value && *cfg->value == '$' )
{ {
int index = get_varnum( cfg->value+1 ); int i = get_varnum( cfg->value+1 );
printf( "\n" ); printf( "\n" );
if ( ! vartable[index].global_written ) if ( ! vartable[i].global_written )
{ {
global( vartable[index].name ); global( vartable[i].name );
} }
printf( "\t" ); printf( "\t" );
} }
...@@ -989,7 +989,6 @@ static void generate_update_var( struct kconfig * scfg, int menu_num ) ...@@ -989,7 +989,6 @@ static void generate_update_var( struct kconfig * scfg, int menu_num )
static void end_proc( struct kconfig * scfg, int menu_num ) static void end_proc( struct kconfig * scfg, int menu_num )
{ {
struct kconfig * cfg; struct kconfig * cfg;
int i;
printf( "\n\n\n" ); printf( "\n\n\n" );
printf( "\tfocus $w\n" ); printf( "\tfocus $w\n" );
...@@ -1084,6 +1083,7 @@ static void end_proc( struct kconfig * scfg, int menu_num ) ...@@ -1084,6 +1083,7 @@ static void end_proc( struct kconfig * scfg, int menu_num )
{ {
if ( cfg->token == token_tristate ) if ( cfg->token == token_tristate )
{ {
int i;
if ( ! vartable[cfg->nameindex].global_written ) if ( ! vartable[cfg->nameindex].global_written )
{ {
vartable[cfg->nameindex].global_written = 1; vartable[cfg->nameindex].global_written = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment