[bk patches] 2.6.x misc updates

[bk patches] 2.6.x misc updates

[Jeff Garzik]

Linus, please do a

	bk pull bk://kernel.bkbits.net/jgarzik/misc-2.5

This will update the following files:

 drivers/block/cciss.c             |    2 ++
 drivers/block/ps2esdi.c           |    2 +-
 drivers/char/agp/amd64-agp.c      |    6 +++---
 drivers/ide/legacy/pdc4030.c      |   12 +++---------
 drivers/mca/mca-legacy.c          |    2 +-
 drivers/mca/mca-proc.c            |   11 ++++++++---
 drivers/net/3c523.c               |    2 +-
 drivers/net/3c527.c               |    2 +-
 drivers/net/at1700.c              |    2 +-
 drivers/net/eexpress.c            |    1 -
 drivers/net/ibmlana.c             |    2 +-
 drivers/net/ne2.c                 |    2 +-
 drivers/net/sk_mca.c              |    2 +-
 drivers/net/tokenring/madgemc.c   |    2 +-
 drivers/net/tokenring/smctr.c     |    2 +-
 drivers/net/wireless/arlan-main.c |    2 ++
 include/linux/mca-legacy.h        |    2 ++
 include/linux/mca.h               |    4 ----
 18 files changed, 30 insertions(+), 30 deletions(-)

through these ChangeSets:

<jgarzik@redhat.com> (03/09/28 1.1381)
   [BK] "bk ignore" aic7xxx auto-generated files

<jgarzik@redhat.com> (03/09/28 1.1380)
   Misc warning fixes:
   * block/cciss: eliminate "comparison always false" warning
   * char/agp/amd64-agp: properly suffix 64-bit constants
   * ide/legacy/pdc4030: fix incomplete conversion to new IDE module API

<jgarzik@redhat.com> (03/09/28 1.1379)
   [wireless arlan] fix modular build
   
   'probe' module parameter is only used when arlan is built as a module.

<jgarzik@redhat.com> (03/09/28 1.1378)
   [MCA] don't include linux/mca-legacy.h from linux/mca.h.
   
   As the functions and definitions in linux/mca-legacy.h are deprecated,
   require that users explicitly include linux/mca-legacy.h as needed.
   
   Prior to this change, _all_ users of linux/mca.h (i.e. proper users)
   issued a warning at compile time, when the MCA legacy API was enabled.
   Now only actual users of the legacy API cause warnings, not all MCA drivers.

<jgarzik@redhat.com> (03/09/28 1.1377)
   [MCA] convert mca-proc to use not-deprecated functions

<jgarzik@redhat.com> (03/09/28 1.1376)
   [MCA] include linux/mca-legacy.h directly, to access deprecated MCA API




diff -Nru a/drivers/block/cciss.c b/drivers/block/cciss.c
--- a/drivers/block/cciss.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/block/cciss.c	Sun Sep 28 10:34:41 2003
@@ -636,9 +636,11 @@
 		{	
 			return -EINVAL;
 		} 
+#if 0 /* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */
 		/* Check kmalloc limits */
 		if(iocommand.buf_size > 128000)
 			return -EINVAL;
+#endif
 		if(iocommand.buf_size > 0)
 		{
 			buff =  kmalloc(iocommand.buf_size, GFP_KERNEL);
diff -Nru a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
--- a/drivers/block/ps2esdi.c	Sun Sep 28 10:34:40 2003
+++ b/drivers/block/ps2esdi.c	Sun Sep 28 10:34:40 2003
@@ -39,7 +39,7 @@
 #include <linux/genhd.h>
 #include <linux/ps2esdi.h>
 #include <linux/blkdev.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff -Nru a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/amd64-agp.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/char/agp/amd64-agp.c	Sun Sep 28 10:34:41 2003
@@ -91,9 +91,9 @@
 	for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
 		tmp = agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
 
-		BUG_ON(tmp & 0xffffff0000000ffc);
-		pte = (tmp & 0x000000ff00000000) >> 28;
-		pte |=(tmp & 0x00000000fffff000);
+		BUG_ON(tmp & 0xffffff0000000ffcULL);
+		pte = (tmp & 0x000000ff00000000ULL) >> 28;
+		pte |=(tmp & 0x00000000fffff000ULL);
 		pte |= GPTE_VALID | GPTE_COHERENT;
 
 		agp_bridge->gatt_table[j] = pte;
diff -Nru a/drivers/ide/legacy/pdc4030.c b/drivers/ide/legacy/pdc4030.c
--- a/drivers/ide/legacy/pdc4030.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/ide/legacy/pdc4030.c	Sun Sep 28 10:34:41 2003
@@ -304,22 +304,16 @@
 
 #ifndef MODULE
 	if (enable_promise_support == 0)
-		return;
+		return 0;
 #endif
 
 	for (index = 0; index < MAX_HWIFS; index++) {
 		hwif = &ide_hwifs[index];
-		if (hwif->chipset == ide_unknown && detect_pdc4030(hwif)) {
-#ifndef MODULE
-			setup_pdc4030(hwif);
-#else
+		if (hwif->chipset == ide_unknown && detect_pdc4030(hwif))
 			return setup_pdc4030(hwif);
-#endif
-		}
 	}
-#ifdef MODULE
+
 	return 0;
-#endif
 }
 
 static void __exit release_pdc4030(ide_hwif_t *hwif, ide_hwif_t *mate)
diff -Nru a/drivers/mca/mca-legacy.c b/drivers/mca/mca-legacy.c
--- a/drivers/mca/mca-legacy.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/mca/mca-legacy.c	Sun Sep 28 10:34:41 2003
@@ -28,7 +28,7 @@
 
 #include <linux/module.h>
 #include <linux/device.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <asm/io.h>
 
 /* NOTE: This structure is stack allocated */
diff -Nru a/drivers/mca/mca-proc.c b/drivers/mca/mca-proc.c
--- a/drivers/mca/mca-proc.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/mca/mca-proc.c	Sun Sep 28 10:34:41 2003
@@ -120,12 +120,13 @@
 	len += sprintf(buf+len, "Id: %02x%02x\n",
 		mca_dev->pos[1], mca_dev->pos[0]);
 	len += sprintf(buf+len, "Enabled: %s\nPOS: ",
-		mca_isenabled(slot) ? "Yes" : "No");
+		mca_device_status(mca_dev) == MCA_ADAPTER_NORMAL ?
+			"Yes" : "No");
 	for(i=0; i<8; i++) {
 		len += sprintf(buf+len, "%02x ", mca_dev->pos[i]);
 	}
 	len += sprintf(buf+len, "\nDriver Installed: %s",
-		mca_is_adapter_used(slot) ? "Yes" : "No");
+		mca_device_claimed(mca_dev) ? "Yes" : "No");
 	buf[len++] = '\n';
 	buf[len] = 0;
 
@@ -189,6 +190,7 @@
 	/* Initialize /proc/mca entries for existing adapters */
 
 	for(i = 0; i < MCA_NUMADAPTERS; i++) {
+		enum MCA_AdapterStatus status;
 		mca_dev = mca_find_device_by_slot(i);
 		if(!mca_dev)
 			continue;
@@ -200,7 +202,10 @@
 		else if(i == MCA_INTEGSCSI) sprintf(mca_dev->procname,"scsi");
 		else if(i == MCA_MOTHERBOARD) sprintf(mca_dev->procname,"planar");
 
-		if(!mca_isadapter(i)) continue;
+		status = mca_device_status(mca_dev);
+		if (status != MCA_ADAPTER_NORMAL &&
+		    status != MCA_ADAPTER_DISABLED)
+			continue;
 
 		node = create_proc_read_entry(mca_dev->procname, 0, proc_mca,
 					      mca_read_proc, (void *)mca_dev);
diff -Nru a/drivers/net/3c523.c b/drivers/net/3c523.c
--- a/drivers/net/3c523.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/3c523.c	Sun Sep 28 10:34:41 2003
@@ -102,7 +102,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/ethtool.h>
 
 #include <asm/uaccess.h>
diff -Nru a/drivers/net/3c527.c b/drivers/net/3c527.c
--- a/drivers/net/3c527.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/3c527.c	Sun Sep 28 10:34:41 2003
@@ -92,7 +92,7 @@
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
 #include <linux/skbuff.h>
diff -Nru a/drivers/net/at1700.c b/drivers/net/at1700.c
--- a/drivers/net/at1700.c	Sun Sep 28 10:34:40 2003
+++ b/drivers/net/at1700.c	Sun Sep 28 10:34:40 2003
@@ -43,7 +43,7 @@
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff -Nru a/drivers/net/eexpress.c b/drivers/net/eexpress.c
--- a/drivers/net/eexpress.c	Sun Sep 28 10:34:40 2003
+++ b/drivers/net/eexpress.c	Sun Sep 28 10:34:40 2003
@@ -113,7 +113,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
-#include <linux/mca.h>
 #include <linux/mca-legacy.h>
 #include <linux/spinlock.h>
 
diff -Nru a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
--- a/drivers/net/ibmlana.c	Sun Sep 28 10:34:40 2003
+++ b/drivers/net/ibmlana.c	Sun Sep 28 10:34:40 2003
@@ -82,7 +82,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/time.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff -Nru a/drivers/net/ne2.c b/drivers/net/ne2.c
--- a/drivers/net/ne2.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/ne2.c	Sun Sep 28 10:34:41 2003
@@ -70,7 +70,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
diff -Nru a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c
--- a/drivers/net/sk_mca.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/sk_mca.c	Sun Sep 28 10:34:41 2003
@@ -89,7 +89,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/time.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/version.h>
diff -Nru a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
--- a/drivers/net/tokenring/madgemc.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/tokenring/madgemc.c	Sun Sep 28 10:34:41 2003
@@ -20,7 +20,7 @@
 static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
 
 #include <linux/module.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
diff -Nru a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
--- a/drivers/net/tokenring/smctr.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/tokenring/smctr.c	Sun Sep 28 10:34:41 2003
@@ -43,7 +43,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/mca.h>
+#include <linux/mca-legacy.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff -Nru a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
--- a/drivers/net/wireless/arlan-main.c	Sun Sep 28 10:34:41 2003
+++ b/drivers/net/wireless/arlan-main.c	Sun Sep 28 10:34:41 2003
@@ -1881,6 +1881,8 @@
 
 #ifdef  MODULE
 
+static int probe = probeUNKNOWN;
+
 static int __init arlan_find_devices(void)
 {
 	int m;
diff -Nru a/include/linux/mca-legacy.h b/include/linux/mca-legacy.h
--- a/include/linux/mca-legacy.h	Sun Sep 28 10:34:41 2003
+++ b/include/linux/mca-legacy.h	Sun Sep 28 10:34:41 2003
@@ -7,6 +7,8 @@
 #ifndef _LINUX_MCA_LEGACY_H
 #define _LINUX_MCA_LEGACY_H
 
+#include <linux/mca.h>
+
 #warning "MCA legacy - please move your driver to the new sysfs api"
 
 /* MCA_NOTFOUND is an error condition.  The other two indicate
diff -Nru a/include/linux/mca.h b/include/linux/mca.h
--- a/include/linux/mca.h	Sun Sep 28 10:34:40 2003
+++ b/include/linux/mca.h	Sun Sep 28 10:34:40 2003
@@ -136,10 +136,6 @@
 /* WARNING: only called by the boot time device setup */
 extern int mca_register_device(int bus, struct mca_device *mca_dev);
 
-#ifdef CONFIG_MCA_LEGACY
-#include <linux/mca-legacy.h>
-#endif
-
 #ifdef CONFIG_MCA_PROC_FS
 extern void mca_do_proc_init(void);
 extern void mca_set_adapter_procfn(int slot, MCA_ProcFn, void* dev);

Re: [bk patches] 2.6.x misc updates

[Dave Jones]

On Sun, Sep 28, 2003 at 10:44:28AM -0400, Jeff Garzik wrote:
 > 
 > Linus, please do a
 > 
 > 	bk pull bk://kernel.bkbits.net/jgarzik/misc-2.5
 > 
 > This will update the following files:
 > 
 >    * char/agp/amd64-agp: properly suffix 64-bit constants

Please don't touch this. It needs fixing in a different way
for 32bit.

I'll dig out the specs and fix it up properly later.

		Dave

-- 
 Dave Jones     http://www.codemonkey.org.uk

Re: [bk patches] 2.6.x misc updates

[Jeff Garzik]

Dave Jones wrote:
> On Sun, Sep 28, 2003 at 10:44:28AM -0400, Jeff Garzik wrote:
>  > 
>  > Linus, please do a
>  > 
>  > 	bk pull bk://kernel.bkbits.net/jgarzik/misc-2.5
>  > 
>  > This will update the following files:
>  > 
>  >    * char/agp/amd64-agp: properly suffix 64-bit constants
> 
> Please don't touch this. It needs fixing in a different way
> for 32bit.


I don't see how the patch could break anything.  It's obviously correct, 
even if the overall code isn't great for IA32.

	Jeff

Re: [bk patches] 2.6.x misc updates

[Dave Jones]

On Sun, Sep 28, 2003 at 01:02:06PM -0400, Jeff Garzik wrote:

 > > > Linus, please do a
 > > > 	bk pull bk://kernel.bkbits.net/jgarzik/misc-2.5
 > > > This will update the following files:
 > > >    * char/agp/amd64-agp: properly suffix 64-bit constants
 > >Please don't touch this. It needs fixing in a different way
 > >for 32bit.
 > 
 > I don't see how the patch could break anything.  It's obviously correct, 
 > even if the overall code isn't great for IA32.

Actually looking at the spec, the PTEs don't change in 32bit or 64bit
mode, so it should do the right thing. I take back my objection
to your change. Go ahead and apply.

		Dave

-- 
 Dave Jones     http://www.codemonkey.org.uk

[BK PATCHES] 2.6.x misc updates

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: changelog.txt --]
[-- Type: text/plain, Size: 712 bytes --]

Please do a

	bk pull bk://gkernel.bkbits.net/misc-2.6

This will update the following files:

 drivers/block/floppy.c   |    1 -
 drivers/char/hw_random.c |   35 ++++++++++++++++-------------------
 sound/oss/i810_audio.c   |   12 ++++++------
 sound/oss/soundcard.c    |    4 ++--
 sound/oss/uart401.c      |    8 ++++----
 5 files changed, 28 insertions(+), 32 deletions(-)

through these ChangeSets:

Adrian Bunk:
  o drivers/char/hw_random.c: make a variable static

James Nelson:
  o hw_random: Minor cleanup to hw_random.c

Jeff Garzik:
  o drivers/block/floppy:  kill #include linux/version.h
  o [sound/oss] use module_param() in soundcard.c and uart401.c
  o [sound/oss i810_audio] use module_param()


[-- Attachment #3: patch.txt --]
[-- Type: text/plain, Size: 4499 bytes --]

diff -Nru a/drivers/block/floppy.c b/drivers/block/floppy.c
--- a/drivers/block/floppy.c	2004-12-27 15:14:25 -05:00
+++ b/drivers/block/floppy.c	2004-12-27 15:14:25 -05:00
@@ -155,7 +155,6 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
-#include <linux/version.h>
 #define FDPATCHES
 #include <linux/fdreg.h>
 
diff -Nru a/drivers/char/hw_random.c b/drivers/char/hw_random.c
--- a/drivers/char/hw_random.c	2004-12-27 15:14:25 -05:00
+++ b/drivers/char/hw_random.c	2004-12-27 15:14:25 -05:00
@@ -56,31 +56,27 @@
 /*
  * debugging macros
  */
-#undef RNG_DEBUG /* define to enable copious debugging info */
 
-#ifdef RNG_DEBUG
-/* note: prints function name for you */
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-#else
-#define DPRINTK(fmt, args...)
-#endif
+/* pr_debug() collapses to a no-op if DEBUG is not defined */
+#define DPRINTK(fmt, args...) pr_debug(PFX "%s: " fmt, __FUNCTION__ , ## args)
+
 
-#define RNG_NDEBUG        /* define to disable lightweight runtime checks */
+#undef RNG_NDEBUG        /* define to enable lightweight runtime checks */
 #ifdef RNG_NDEBUG
-#define assert(expr)
+#define assert(expr)							\
+		if(!(expr)) {						\
+		printk(KERN_DEBUG PFX "Assertion failed! %s,%s,%s,"	\
+		"line=%d\n", #expr, __FILE__, __FUNCTION__, __LINE__);	\
+		}
 #else
-#define assert(expr) \
-        if(!(expr)) {                                   \
-        printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-        #expr,__FILE__,__FUNCTION__,__LINE__);          \
-        }
+#define assert(expr)
 #endif
 
 #define RNG_MISCDEV_MINOR		183 /* official */
 
 static int rng_dev_open (struct inode *inode, struct file *filp);
 static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
-			     loff_t * offp);
+				loff_t * offp);
 
 static int __init intel_init (struct pci_dev *dev);
 static void intel_cleanup(void);
@@ -322,7 +318,8 @@
 	rnen |= (1 << 7);	/* PMIO enable */
 	pci_write_config_byte(dev, 0x41, rnen);
 
-	printk(KERN_INFO PFX "AMD768 system management I/O registers at 0x%X.\n", pmbase);
+	pr_info( PFX "AMD768 system management I/O registers at 0x%X.\n",
+			pmbase);
 
 	amd_dev = dev;
 
@@ -369,7 +366,7 @@
 	VIA_RNG_CHUNK_1_MASK	= 0xFF,
 };
 
-u32 via_rng_datum;
+static u32 via_rng_datum;
 
 /*
  * Investigate using the 'rep' prefix to obtain 32 bits of random data
@@ -483,7 +480,7 @@
 
 
 static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
-			     loff_t * offp)
+				loff_t * offp)
 {
 	static spinlock_t rng_lock = SPIN_LOCK_UNLOCKED;
 	unsigned int have_data;
@@ -606,7 +603,7 @@
 	if (rc)
 		return rc;
 
-	printk (KERN_INFO RNG_DRIVER_NAME " loaded\n");
+	pr_info( RNG_DRIVER_NAME " loaded\n");
 
 	DPRINTK ("EXIT, returning 0\n");
 	return 0;
diff -Nru a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
--- a/sound/oss/i810_audio.c	2004-12-27 15:14:25 -05:00
+++ b/sound/oss/i810_audio.c	2004-12-27 15:14:25 -05:00
@@ -3460,15 +3460,15 @@
 }	
 #endif /* CONFIG_PM */
 
-MODULE_AUTHOR("");
+MODULE_AUTHOR("The Linux kernel team");
 MODULE_DESCRIPTION("Intel 810 audio support");
 MODULE_LICENSE("GPL");
-MODULE_PARM(ftsodell, "i");
-MODULE_PARM(clocking, "i");
-MODULE_PARM(strict_clocking, "i");
-MODULE_PARM(spdif_locked, "i");
+module_param(ftsodell, int, 0444);
+module_param(clocking, uint, 0444);
+module_param(strict_clocking, int, 0444);
+module_param(spdif_locked, int, 0444);
 
-#define I810_MODULE_NAME "intel810_audio"
+#define I810_MODULE_NAME "i810_audio"
 
 static struct pci_driver i810_pci_driver = {
 	.name		= I810_MODULE_NAME,
diff -Nru a/sound/oss/soundcard.c b/sound/oss/soundcard.c
--- a/sound/oss/soundcard.c	2004-12-27 15:14:25 -05:00
+++ b/sound/oss/soundcard.c	2004-12-27 15:14:25 -05:00
@@ -535,8 +535,8 @@
 static int dmabuf;
 static int dmabug;
 
-MODULE_PARM(dmabuf, "i");
-MODULE_PARM(dmabug, "i");
+module_param(dmabuf, int, 0444);
+module_param(dmabug, int, 0444);
 
 static int __init oss_init(void)
 {
diff -Nru a/sound/oss/uart401.c b/sound/oss/uart401.c
--- a/sound/oss/uart401.c	2004-12-27 15:14:25 -05:00
+++ b/sound/oss/uart401.c	2004-12-27 15:14:25 -05:00
@@ -430,11 +430,11 @@
 
 static struct address_info cfg_mpu;
 
-static int __initdata io = -1;
-static int __initdata irq = -1;
+static int io = -1;
+static int irq = -1;
 
-MODULE_PARM(io, "i");
-MODULE_PARM(irq, "i");
+module_param(io, int, 0444);
+module_param(irq, int, 0444);
 
 
 static int __init init_uart401(void)

[BK PATCHES] 2.6.x misc updates

[Jeff Garzik]

viro was bugging me about the lack of (arg) in nth_page() definition...

Please do a

	bk pull bk://gkernel.bkbits.net/misc-2.6

This will update the following files:

 Documentation/hw_random.txt |   69 --------------------------------------------
 include/linux/mm.h          |    2 -
 2 files changed, 1 insertion(+), 70 deletions(-)

through these ChangeSets:

<jgarzik@pobox.com> (04/11/13 1.2095)
   Parenthize nth_page() macro arg, in linux/mm.h.

<james4765@verizon.net> (04/11/06 1.2026.70.1)
   [PATCH] hw_random: Remove changelog from hw_random.txt
   
   Remove pre-merge changelog from Documentation/hw_random.txt
   
   Signed-off-by: James Nelson <james4765@gmail.com>
   Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff -Nru a/Documentation/hw_random.txt b/Documentation/hw_random.txt
--- a/Documentation/hw_random.txt	2004-11-13 15:53:11 -05:00
+++ b/Documentation/hw_random.txt	2004-11-13 15:53:11 -05:00
@@ -67,72 +67,3 @@
 
 	Special thanks to Matt Sottek.  I did the "guts", he
 	did the "brains" and all the testing.
-
-Change history:
-
-	Version 1.0.0:
-	* Merge Intel, AMD, VIA RNG drivers into one.
-	  Further changelog in BitKeeper.
-
-	Version 0.9.8:
-	* Support other i8xx chipsets by adding 82801E detection
-	* 82801DB detection is the same as for 82801CA.
-
-	Version 0.9.7:
-	* Support other i8xx chipsets too (by adding 82801BA(M) and
-	  82801CA(M) detection)
-
-	Version 0.9.6:
-	* Internal driver cleanups, prep for 1.0.0 release.
-
-	Version 0.9.5:
-	* Rip out entropy injection via timer.  It never ever worked,
-	  and a better solution (rngd) is now available.
-
-	Version 0.9.4:
-	* Fix: Remove request_mem_region
-	* Fix: Horrible bugs in FIPS calculation and test execution
-
-	Version 0.9.3:
-	* Clean up rng_read a bit.
-	* Update i810_rng driver Web site URL.
-	* Increase default timer interval to 4 samples per second.
-	* Abort if mem region is not available.
-	* BSS zero-initialization cleanup.
-	* Call misc_register() from rng_init_one.
-	* Fix O_NONBLOCK to occur before we schedule.
-
-	Version 0.9.2:
-	* Simplify open blocking logic
-
-	Version 0.9.1:
-	* Support i815 chipsets too (Matt Sottek)
-	* Fix reference counting when statically compiled (prumpf)
-	* Rewrite rng_dev_read (prumpf)
-	* Make module races less likely (prumpf)
-	* Small miscellaneous bug fixes (prumpf)
-	* Use pci table for PCI id list
-
-	Version 0.9.0:
-	* Don't register a pci_driver, because we are really
-	  using PCI bridge vendor/device ids, and someone
-	  may want to register a driver for the bridge. (bug fix)
-	* Don't let the usage count go negative (bug fix)
-	* Clean up spinlocks (bug fix)
-	* Enable PCI device, if necessary (bug fix)
-	* iounmap on module unload (bug fix)
-	* If RNG chrdev is already in use when open(2) is called,
-	  sleep until it is available.
-	* Remove redundant globals rng_allocated, rng_use_count
-	* Convert numeric globals to unsigned
-	* Module unload cleanup
-
-	Version 0.6.2:
-	* Clean up spinlocks.  Since we don't have any interrupts
-	  to worry about, but we do have a timer to worry about,
-	  we use spin_lock_bh everywhere except the timer function
-	  itself.
-	* Fix module load/unload.
-	* Fix timer function and h/w enable/disable logic
-	* New timer interval sysctl
-	* Clean up sysctl names
diff -Nru a/include/linux/mm.h b/include/linux/mm.h
--- a/include/linux/mm.h	2004-11-13 15:53:11 -05:00
+++ b/include/linux/mm.h	2004-11-13 15:53:11 -05:00
@@ -41,7 +41,7 @@
 #define MM_VM_SIZE(mm)	TASK_SIZE
 #endif
 
-#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + n)
+#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
 
 /*
  * Linux kernel virtual memory manager primitives.