gc-linux-cvs — CVS commit logs.

[Gc-linux-cvs] linux/fs/gcdvdfs main.c,1.1,1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/fs/gcdvdfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/fs/gcdvdfs

Modified Files:
	main.c 
Log Message:
Merged 2.6.18.


Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/gcdvdfs/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c	6 Mar 2006 00:32:42 -0000	1.1
+++ main.c	17 Feb 2007 23:43:42 -0000	1.2
@@ -141,8 +141,9 @@
   i_size_write(i,size);
 }
 
-static int gc_dvdfs_statfs(struct super_block *sb,struct kstatfs *sfs)
+static int gc_dvdfs_statfs(struct dentry * dentry,struct kstatfs *sfs)
 {
+  struct super_block *sb = dentry->d_sb;
   struct gc_dvdfs_fst *fst = (struct gc_dvdfs_fst*)sb->s_fs_info;
 
   sfs->f_type   = sb->s_magic;
@@ -312,9 +313,9 @@
   return -EINVAL;
 }
 
-static struct super_block *gc_dvdfs_get_sb(struct file_system_type *fs_type,int flags,const char *dev_name,void *data)
+static int gc_dvdfs_get_sb(struct file_system_type *fs_type,int flags,const char *dev_name,void *data,struct vfsmount *mnt)
 {
-  return get_sb_bdev(fs_type,flags,dev_name,data,gc_dvdfs_fill_super);
+  return get_sb_bdev(fs_type,flags,dev_name,data,gc_dvdfs_fill_super,mnt);
 }
 
 static struct file_system_type gcdvdfs_type = {

[Gc-linux-cvs] linux/drivers/block Kconfig, 1.22, 1.23 gcn-aram.c, 1.11, 1.12 gcn-sd.c, 1.7, 1.8

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/block

Modified Files:
	Kconfig gcn-aram.c gcn-sd.c 
Log Message:
Merged 2.6.18.


Index: gcn-aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gcn-aram.c	24 Mar 2006 21:45:18 -0000	1.11
+++ gcn-aram.c	17 Feb 2007 23:43:40 -0000	1.12
@@ -416,7 +416,6 @@
 	disk->first_minor = 0;
 	disk->fops = &aram_fops;
 	strcpy(disk->disk_name, ARAM_NAME);
-	strcpy(disk->devfs_name, disk->disk_name);
 	disk->queue = adev->queue;
 	set_capacity(disk, ARAM_BUFFERSIZE >> 9);
 	disk->private_data = adev;

Index: gcn-sd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gcn-sd.c	24 Mar 2006 21:45:18 -0000	1.7
+++ gcn-sd.c	17 Feb 2007 23:43:40 -0000	1.8
@@ -2,10 +2,10 @@
  * drivers/block/gcn-sd.c
  *
  * MMC/SD card block driver for the Nintendo GameCube
- * Copyright (C) 2005 The GameCube Linux Team
+ * Copyright (C) 2004-2006 The GameCube Linux Team
  * Copyright (C) 2004,2005 Rob Reylink
  * Copyright (C) 2005 Todd Jeffreys
- * Copyright (C) 2005 Albert Herranz
+ * Copyright (C) 2005,2006 Albert Herranz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
 /*
  * This is a block device driver for the Nintendo SD Card Adapter (DOL-019)
  * and compatible hardware.
- * The driver has been tested with SPI-enabled MMC cards, and SD cards.
+ * The driver has been tested with SPI-enabled MMC cards and SD cards.
  *
  * The following table shows the device major and minors needed to access
  * MMC/SD cards:
@@ -81,7 +81,7 @@
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_LICENSE("GPL");
 
-static char sd_driver_version[] = "0.4-isobel";
+static char sd_driver_version[] = "3.1-isobel";
 
 #define sd_printk(level, format, arg...) \
 	printk(level DRV_MODULE_NAME ": " format , ## arg)
@@ -93,6 +93,11 @@
 #  define DBG(fmt, args...)
 #endif
 
+
+/*
+ *
+ * EXI related definitions.
+ */
 #define SD_SLOTA_CHANNEL	0	/* EXI0xxx */
 #define SD_SLOTA_DEVICE		0	/* chip select, EXI0CSB0 */
 
@@ -102,6 +107,12 @@
 #define SD_SPI_CLK		16000000
 #define SD_SPI_CLK_IDX		EXI_CLK_16MHZ
 
+
+/*
+ *
+ * MMC/SD related definitions.
+ */
+
 /* cycles in 8 clock units */
 #define SD_IDLE_CYCLES		80
 #define SD_FINISH_CYCLES	8
@@ -149,14 +160,6 @@
 /* this is still a missing command in the current MMC framework ... */
 #define MMC_READ_OCR		58
 
-#define MMC_SHIFT		3	/* 8 partitions */
-
-#define SD_MAJOR		61
-#define SD_NAME			"sdcard"
-
-#define KERNEL_SECTOR_SHIFT     9
-#define KERNEL_SECTOR_SIZE      (1 << KERNEL_SECTOR_SHIFT)	/*512 */
-
 /*
  * OCR Bit positions to 10s of Vdd mV.
  */
@@ -185,10 +188,26 @@
 	35, 40, 45, 50, 55, 60, 70, 80,
 };
 
+/*
+ *
+ * Driver settings.
+ */
+#define MMC_SHIFT		3	/* 8 partitions */
+
+#define SD_MAJOR		61
+#define SD_NAME			"sdcard"
+
+#define KERNEL_SECTOR_SHIFT     9
+#define KERNEL_SECTOR_SIZE      (1 << KERNEL_SECTOR_SHIFT)	/*512 */
+
+unsigned long unclean_slots = 0;
+
 enum {
 	__SD_MEDIA_CHANGED = 0,
+	__SD_DEL,
 };
 
+
 /*
  * Raw MMC/SD command.
  */
@@ -206,7 +225,7 @@
  */
 struct sd_host {
 	spinlock_t lock;
-
+	int refcnt;
 	unsigned long flags;
 #define SD_MEDIA_CHANGED	(1<<__SD_MEDIA_CHANGED)
 
@@ -235,9 +254,8 @@
 	struct request_queue *queue;
 	spinlock_t queue_lock;
 
-	int refcnt;
-
 	struct task_struct	*io_thread;
+	struct completion	io_thread_complete;
 	wait_queue_head_t	io_waitq;
 	struct request		*req;
 
@@ -247,8 +265,8 @@
 static void sd_kill(struct sd_host *host);
 
 /*
- * MMC/SD data structures manipulation.
  *
+ * MMC/SD data structures manipulation.
  */
 
 /*
@@ -468,6 +486,7 @@
 }
 
 /*
+ *
  * SPI I/O support routines, including some handy SPI to EXI language
  * translations.
  */
@@ -628,8 +647,8 @@
 }
 
 /*
- * MMC/SD command transactions related routines.
  *
+ * MMC/SD command transactions related routines.
  */
 
 /* */
@@ -1063,8 +1082,8 @@
 }
 
 /*
- * Block layer.
  *
+ * Block layer.
  */
 
 /*
@@ -1091,7 +1110,6 @@
 
 		start += block_len;
 		buf += block_len;
-
 	}
 
 	/* number of kernel sectors transferred */
@@ -1126,7 +1144,6 @@
 
 		start += block_len;
 		buf += block_len;
-
 	}
 
 	/* number of kernel sectors transferred */
@@ -1135,6 +1152,8 @@
 	return retval;
 }
 
+static void sd_end_request(struct request *req, unsigned long nr_sectors);
+
 /*
  * Input/Output thread. Sends and receives packets.
  */
@@ -1156,46 +1175,74 @@
         current->flags |= PF_NOFREEZE;
         set_current_state(TASK_RUNNING);
 
-        while(!kthread_should_stop()) {
-                for(;;) {
-			spin_lock_irqsave(&host->lock, flags);
-			if (!host->req) {
-				spin_unlock_irqrestore(&host->lock, flags);
+	for(;;) {
+                wait_event(host->io_waitq, host->req || kthread_should_stop());
+
+		spin_lock_irqsave(&host->lock, flags);
+		if (!host->req) {
+			spin_unlock_irqrestore(&host->lock, flags);
+			if (kthread_should_stop())
 				break;
+			else {
+				spin_lock_irqsave(&host->queue_lock, flags);
+				blk_start_queue(host->queue);
+				spin_unlock_irqrestore(&host->queue_lock, flags);
+				continue;
 			}
-			req = host->req;
-			host->req = NULL;
-			spin_unlock_irqrestore(&host->lock, flags);
+		}
+		req = host->req;
+		host->req = NULL;
+		spin_unlock_irqrestore(&host->lock, flags);
 
-			/* proceed with i/o requests */
-			if (rq_data_dir(req) == WRITE) {
-				retval = sd_write_request(host, req);
-			} else {
-				retval = sd_read_request(host, req);
-			}
+		if (kthread_should_stop()) {
+			req->errors++;
+			sd_end_request(req, 0);
+			break;
+		}
 
-			if (retval <= 0) {
-				uptodate = 0;
-				nr_sectors = 0;
-			} else {
-				uptodate = (retval > 0)?1:0;
-				nr_sectors = retval;
-			}
+		/* proceed with i/o requests */
+		if (rq_data_dir(req) == WRITE) {
+			retval = sd_write_request(host, req);
+		} else {
+			retval = sd_read_request(host, req);
+		}
 
-			if (!end_that_request_first(req, uptodate, nr_sectors))
-				end_that_request_last(req, uptodate);
+		if (retval <= 0) {
+			uptodate = 0;
+			nr_sectors = 0;
+		} else {
+			uptodate = (retval > 0)?1:0;
+			nr_sectors = retval;
+		}
+		if (!uptodate)
+			req->errors++;
 
-			/* avoid cpu monopolization, we are damn greedy */
-			//yield();
-			cond_resched();
+		sd_end_request(req, nr_sectors);
 
-			spin_lock(&host->queue_lock);
-			blk_start_queue(host->queue);
-			spin_unlock(&host->queue_lock);
-                }
-                wait_event(host->io_waitq, host->req || kthread_should_stop());
-        }
-        return 0;
+		/* avoid cpu monopolization, we are damn greedy */
+		//yield();
+		cond_resched();
+
+		spin_lock_irqsave(&host->queue_lock, flags);
+		blk_start_queue(host->queue);
+		spin_unlock_irqrestore(&host->queue_lock, flags);
+	}
+
+	complete(&host->io_thread_complete);
+	return 0;
+}
+
+static void sd_end_request(struct request *req, unsigned long nr_sectors)
+{
+	int uptodate = (req->errors == 0) ? 1 : 0;
+	request_queue_t *q = req->q;
+	unsigned long flags;
+
+	spin_lock_irqsave(q->queue_lock, flags);
+	if (!end_that_request_first(req, uptodate, nr_sectors)) {
+		end_that_request_last(req, uptodate);
+	}
+	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
 /*
@@ -1213,9 +1260,14 @@
 					KERNEL_SECTOR_SHIFT);
 
 	while ((req = elv_next_request(q))) {
+		/* ignore requests that we can't handle */
+		if (!blk_fs_request(req)) {
+			continue;
+		}
+
 		/* pulling the card out while mounted is bold... */
-		if (exi_is_dying(host->exi_device)) {
-			sd_printk(KERN_ERR, "card in use removed, aborting\n");
+		if (!host->exi_device) {
+			sd_printk(KERN_ERR, "device removed, aborting\n");
 			end_request(req, 0);
 			continue;
 		}
@@ -1225,10 +1277,6 @@
 			continue;
 		}
 
-		/* ignore requests that we can't handle */
-		if (!blk_fs_request(req))
-			continue;
-
 		/* keep our reads within limits */
 		if (req->sector + req->current_nr_sectors > nr_sectors) {
 			sd_printk(KERN_ERR, "reading past end\n");
@@ -1236,27 +1284,29 @@
 			continue;
 		}
 
-		/* schedule the request if there transfer slot is free */
 		spin_lock_irqsave(&host->lock, flags);
+
+		/* throttle if the transfer slot is not free */
 		if (host->req) {
 			blk_stop_queue(q);
 			spin_unlock_irqrestore(&host->lock, flags);
 			break;
 		}
-		blkdev_dequeue_request(req);
+
 		host->req = req;
-		blk_stop_queue(q);
 		spin_unlock_irqrestore(&host->lock, flags);
 
-		/* wake up the i/o thread */
+		/* pop a single request... */
+		blkdev_dequeue_request(req);
+
+		/* ... and wake up the i/o thread to process it */
 		wake_up(&host->io_waitq);
-		break;
 	}
 }
 
 /*
- * Driver
  *
+ * Driver interface.
  */
 
 static DECLARE_MUTEX(open_lock);
@@ -1267,9 +1317,11 @@
 static int sd_open(struct inode *inode, struct file *filp)
 {
 	struct sd_host *host = inode->i_bdev->bd_disk->private_data;
+	int slot;
 	int retval = 0;
 
-	down(&open_lock);
+	if (!host || !host->exi_device)
+		return -ENXIO;
 
 	/* honor exclusive open mode */
 	if (host->refcnt == -1 ||
@@ -1278,21 +1330,37 @@
 		goto out;
 	}
 
+	/*
+	 * Force revalidation of media on slots where a card was unsafely
+	 * removed while mounted.
+	 * This makes sure that partitions will be visible on a card
+	 * inserted between the unsafe removal of a card and the umount
+	 * of all mounts from that card.
+	 */
+	if (host->exi_device) {
+		slot = to_channel(exi_get_exi_channel(host->exi_device));
+		if (test_and_clear_bit(slot, &unclean_slots)) {
+			set_bit(__SD_MEDIA_CHANGED, &host->flags);
+		}
+	}
+
 	/* this takes care of revalidating the media if needed */
 	check_disk_change(inode->i_bdev);
-
 	if (!host->card.csd.capacity) {
 		retval = -ENOMEDIUM;
 		goto out;
 	}
 
+	down(&open_lock);
+
 	if ((filp->f_flags & O_EXCL))
 		host->refcnt = -1;
 	else
 		host->refcnt++;
 
-out:
 	up(&open_lock);
+
+out:
 	return retval;
 
 }
@@ -1304,6 +1372,9 @@
 {
 	struct sd_host *host = inode->i_bdev->bd_disk->private_data;
 
+	if (!host)
+		return -ENXIO;
+
 	down(&open_lock);
 
 	if (host->refcnt > 0)
@@ -1312,12 +1383,12 @@
 		host->refcnt = 0;
 	}
 
-	/* kill the device if we are dying and no more openers exist */
-	if (!host->refcnt && exi_is_dying(host->exi_device))
-		sd_kill(host);
-
 	up(&open_lock);
 
+	/* lazy removal of unreferenced zombies */
+	if (!host->refcnt && !host->exi_device)
+		kfree(host);
+
 	return 0;
 }
 
@@ -1330,6 +1401,10 @@
 	unsigned int last_serial;
 	int retval;
 
+	/* report a media change for zombies */
+	if (!host)
+		return 1;
+
 	/* report a media change if someone forced it */
 	if (test_bit(__SD_MEDIA_CHANGED, &host->flags))
 		return 1;
@@ -1354,6 +1429,12 @@
 	struct sd_host *host = disk->private_data;
 	int retval = 0;
 
+	/* report missing medium for zombies */
+	if (!host) {
+		retval = -ENOMEDIUM;
+		goto out;
+	}
+
 	/* the block layer likes to call us multiple times... */
 	if (!sd_media_changed(host->disk))
 		goto out;
@@ -1433,8 +1514,8 @@
 	int retval;
 
 	channel = to_channel(exi_get_exi_channel(host->exi_device));
-	host->refcnt = 0;
 
+	/* queue */
 	retval = -ENOMEM;
 	spin_lock_init(&host->queue_lock);
 	queue = blk_init_queue(sd_do_request, &host->queue_lock);
@@ -1442,7 +1523,6 @@
 		sd_printk(KERN_ERR, "error initializing queue\n");
 		goto err_blk_init_queue;
 	}
-
 	blk_queue_dma_alignment(queue, EXI_DMA_ALIGN);
 	blk_queue_max_phys_segments(queue, 1);
 	blk_queue_max_hw_segments(queue, 1);
@@ -1450,6 +1530,7 @@
 	queue->queuedata = host;
 	host->queue = queue;
 
+	/* disk */
 	disk = alloc_disk(1 << MMC_SHIFT);
 	if (!disk) {
 		sd_printk(KERN_ERR, "error allocating disk\n");
@@ -1459,27 +1540,16 @@
 	disk->first_minor = channel << MMC_SHIFT;
 	disk->fops = &sd_fops;
 	sprintf(disk->disk_name, "%s%c", SD_NAME, 'a' + channel);
-	sprintf(disk->devfs_name, "%s/target%d", SD_NAME, channel);
 	disk->private_data = host;
 	disk->queue = host->queue;
 	host->disk = disk;
 
-	init_waitqueue_head(&host->io_waitq);
-	host->io_thread = kthread_run(sd_io_thread, host,
-				      "ksdiod/%c", 'a' + channel);
-	if (IS_ERR(host->io_thread)) {
-		sd_printk(KERN_ERR, "error creating io thread\n");
-		goto err_io_thread;
-	}
-
 	retval = 0;
 	goto out;
 
-err_io_thread:
-	del_gendisk(host->disk);
-	put_disk(host->disk);
 err_alloc_disk:
-	blk_put_queue(host->queue);
+	blk_cleanup_queue(host->queue);
+	host->queue = NULL;
 err_blk_init_queue:
 out:
 	return retval;
@@ -1491,23 +1561,52 @@
 static void sd_exit_blk_dev(struct sd_host *host)
 {
 	if (host->disk) {
-		del_gendisk(host->disk);
 		put_disk(host->disk);
 		host->disk = NULL;
 	}
 	if (host->queue) {
-		blk_put_queue(host->queue);
+		blk_cleanup_queue(host->queue);
 		host->queue = NULL;
 	}
+}
+
+
+/*
+ * Initializes and launches the IO thread.
+ */
+static int sd_init_io_thread(struct sd_host *host)
+{
+	int channel;
+	int result = 0;
+
+	channel = to_channel(exi_get_exi_channel(host->exi_device));
+
+	init_completion(&host->io_thread_complete);
+	init_waitqueue_head(&host->io_waitq);
+	host->io_thread = kthread_run(sd_io_thread, host,
+				      "ksdiod/%c", 'a' + channel);
+	if (IS_ERR(host->io_thread)) {
+		sd_printk(KERN_ERR, "error creating io thread\n");
+		result = PTR_ERR(host->io_thread);
+	}
+	return result;
+}
 
+/*
+ * Terminates and waits for the IO thread to complete.
+ */
+static void sd_exit_io_thread(struct sd_host *host)
+{
 	if (!IS_ERR(host->io_thread)) {
 		kthread_stop(host->io_thread);
 		wake_up(&host->io_waitq);
+		wait_for_completion(&host->io_thread_complete);
+		host->io_thread = ERR_PTR(-EINVAL);
 	}
 }
 
 /*
- *
+ * Initializes a host.
  */
 static int sd_init(struct sd_host *host)
 {
@@ -1515,6 +1614,7 @@
 
 	spin_lock_init(&host->lock);
 
+	host->refcnt = 0;
 	set_bit(__SD_MEDIA_CHANGED, &host->flags);
 
 	host->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
@@ -1528,8 +1628,14 @@
 			retval = -ENODEV;
 			goto err_blk_dev;
 		}
+
+		retval = sd_init_io_thread(host);
+		if (retval) 
+			goto err_blk_dev;
+
 		add_disk(host->disk);
 	}
+
 	return retval;
 
 err_blk_dev:
@@ -1538,33 +1644,47 @@
 }
 
 /*
- *
+ * Deinitializes (exits) a host.
  */
 static void sd_exit(struct sd_host *host)
 {
+	del_gendisk(host->disk);
+	sd_exit_io_thread(host);
 	sd_exit_blk_dev(host);
 }
 
 /*
- *
+ * Terminates a host.
  */
 static void sd_kill(struct sd_host *host)
 {
 	struct exi_device *exi_device = host->exi_device;
+	int slot;
 
-	if (host) {
-		sd_exit(host);
-		if (host->exi_device)
-			exi_device_put(host->exi_device);
-		host->exi_device = NULL;
-		kfree(host);
+	if (host->refcnt > 0) {
+		sd_printk(KERN_ERR, "hey! card removed while in use!\n");
+		if (exi_device) {
+			slot = to_channel(exi_get_exi_channel(exi_device));
+			set_bit(slot, &unclean_slots);
+		}
 	}
-	exi_set_dying(exi_device, 0);
-	exi_set_drvdata(exi_device, NULL);
+
+	sd_exit(host);
+	host->exi_device = NULL;
+
+	if (exi_device) {
+		exi_set_drvdata(exi_device, NULL);
+		exi_device_put(exi_device);
+	}
+
+	/* release the host immediately when not in use */
+	if (!host->refcnt)
+		kfree(host);
 }
 
 /*
- *
+ * Checks if the given EXI device is a MMC/SD card and makes it available
+ * if true.
  */
 static int sd_probe(struct exi_device *exi_device)
 {
@@ -1575,37 +1695,31 @@
 	if (exi_device->eid.id != EXI_ID_NONE)
 		return -ENODEV;
 
-	host = kmalloc(sizeof(*host), GFP_KERNEL);
+	host = kzalloc(sizeof(*host), GFP_KERNEL);
 	if (!host)
 		return -ENOMEM;
 
-	memset(host, 0, sizeof(*host));
-
 	host->exi_device = exi_device_get(exi_device);
+	exi_set_drvdata(exi_device, host);
 	retval = sd_init(host);
-	if (!retval) {
-		exi_set_drvdata(exi_device, host);
-	} else {
-		exi_device_put(exi_device);
+	if (retval) {
+		exi_set_drvdata(exi_device, NULL);
 		host->exi_device = NULL;
 		kfree(host);
+		exi_device_put(exi_device);
 	}
 	return retval;
 }
 
 /*
- *
+ * Makes unavailable the MMC/SD card identified by the EXI device `exi_device'.
  */
 static void sd_remove(struct exi_device *exi_device)
 {
 	struct sd_host *host = exi_get_drvdata(exi_device);
 
-	if (host->refcnt > 0) {
-		sd_printk(KERN_ERR, "hey! attempt to remove device in use!\n");
-		exi_set_dying(exi_device, 1);
-	} else {
+	if (host)
 		sd_kill(host);
-	}
 }
 
 static struct exi_device_id sd_eid_table[] = {
@@ -1645,7 +1759,7 @@
 
 	retval = exi_driver_register(&sd_driver);
 
-      out:
+out:
 	return retval;
 }
 
@@ -1657,3 +1771,4 @@
 
 module_init(sd_init_module);
 module_exit(sd_exit_module);
+

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Kconfig	21 Jun 2006 18:56:06 -0000	1.22
+++ Kconfig	17 Feb 2007 23:43:40 -0000	1.23
@@ -462,8 +462,19 @@
 	  what are you doing. If you are using IBM S/390, then set this to
 	  8192.
 
+config BLK_DEV_RAM_BLOCKSIZE
+	int "Default RAM disk block size (bytes)"
+	depends on BLK_DEV_RAM
+	default "1024"
+	help
+	  The default value is 1024 kilobytes.  PAGE_SIZE is a much more
+	  efficient choice however.  The default is kept to ensure initrd
+	  setups function - apparently needed by the rd_load_image routine
+	  that supposes the filesystem in the image uses a 1024 blocksize.
+
 config BLK_DEV_INITRD
 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+	depends on BROKEN || !FRV
 	help
 	  The initial RAM filesystem is a ramfs which is loaded by the
 	  boot loader (loadlin or lilo) and that is mounted as root

[Gc-linux-cvs] linux/sound/ppc Makefile,1.5,1.6

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/sound/ppc

Modified Files:
	Makefile 
Log Message:
Merged 2.6.18.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	17 May 2006 22:14:40 -0000	1.5
+++ Makefile	17 Feb 2007 23:43:42 -0000	1.6
@@ -3,7 +3,7 @@
 # Copyright (c) 2001 by Jaroslav Kysela <pe...@su...>
 #
 
-snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o toonie.o keywest.o beep.o
+snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
 snd-gcn-objs := gcn-ai.o
 
 # Toplevel Module Dependency

[Gc-linux-cvs] linux/include/asm-ppc io.h,1.14,1.15

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/include/asm-ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/include/asm-ppc

Modified Files:
	io.h 
Log Message:
Merged 2.6.18.


Index: io.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- io.h	21 Jun 2006 18:56:06 -0000	1.14
+++ io.h	17 Feb 2007 23:43:42 -0000	1.15
@@ -2,7 +2,6 @@
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
@@ -37,7 +36,7 @@
 #include <asm/mpc83xx.h>
 #elif defined(CONFIG_85xx)
 #include <asm/mpc85xx.h>
-#elif defined(CONFIG_APUS)
+#elif defined(CONFIG_APUS) || defined(CONFIG_GAMECUBE)
 #define _IO_BASE	0
 #define _ISA_MEM_BASE	0
 #define PCI_DRAM_OFFSET 0
@@ -64,7 +63,7 @@
 	int ret;
 
 	__asm__ __volatile__(
-		"lbz%U1%X1 %0,%1;\n"
+		"sync; lbz%U1%X1 %0,%1;\n"
 		"twi 0,%0,0;\n"
 		"isync" : "=r" (ret) : "m" (*addr));
 	return ret;
@@ -79,7 +78,7 @@
 {
 	int ret;
 
-	__asm__ __volatile__("lhbrx %0,0,%1;\n"
+	__asm__ __volatile__("sync; lhbrx %0,0,%1;\n"
 			     "twi 0,%0,0;\n"
 			     "isync" : "=r" (ret) :
 			      "r" (addr), "m" (*addr));
@@ -90,7 +89,7 @@
 {
 	int ret;
 
-	__asm__ __volatile__("lhz%U1%X1 %0,%1;\n"
+	__asm__ __volatile__("sync; lhz%U1%X1 %0,%1;\n"
 			     "twi 0,%0,0;\n"
 			     "isync" : "=r" (ret) : "m" (*addr));
 	return ret;
@@ -98,20 +97,20 @@
 
 extern inline void out_le16(volatile unsigned short __iomem *addr, int val)
 {
-	__asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) :
+	__asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) :
 			      "r" (val), "r" (addr));
 }
 
 extern inline void out_be16(volatile unsigned short __iomem *addr, int val)
 {
-	__asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
+	__asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
 }
 
 extern inline unsigned in_le32(const volatile unsigned __iomem *addr)
 {
 	unsigned ret;
 
-	__asm__ __volatile__("lwbrx %0,0,%1;\n"
+	__asm__ __volatile__("sync; lwbrx %0,0,%1;\n"
 			     "twi 0,%0,0;\n"
 			     "isync" : "=r" (ret) :
 			     "r" (addr), "m" (*addr));
@@ -122,7 +121,7 @@
 {
 	unsigned ret;
 
-	__asm__ __volatile__("lwz%U1%X1 %0,%1;\n"
+	__asm__ __volatile__("sync; lwz%U1%X1 %0,%1;\n"
 			     "twi 0,%0,0;\n"
 			     "isync" : "=r" (ret) : "m" (*addr));
 	return ret;
@@ -130,13 +129,13 @@
 
 extern inline void out_le32(volatile unsigned __iomem *addr, int val)
 {
-	__asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) :
+	__asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) :
 			     "r" (val), "r" (addr));
 }
 
 extern inline void out_be32(volatile unsigned __iomem *addr, int val)
 {
-	__asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
+	__asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
 }
 #if defined (CONFIG_8260_PCI9)
 #define readb(addr) in_8((volatile u8 *)(addr))
@@ -260,6 +259,7 @@
 {							\
 	unsigned int x;					\
 	__asm__ __volatile__(				\
+		"sync\n"				\
 		"0:"	op "	%0,0,%1\n"		\
 		"1:	twi	0,%0,0\n"		\
 		"2:	isync\n"			\
@@ -285,6 +285,7 @@
 extern __inline__ void name(unsigned int val, unsigned int port) \
 {							\
 	__asm__ __volatile__(				\
+		"sync\n"				\
 		"0:" op " %0,0,%1\n"			\
 		"1:	sync\n"				\
 		"2:\n"					\

[Gc-linux-cvs] linux/drivers/video Kconfig, 1.19, 1.20 Makefile, 1.18, 1.19 gcngx.c, 1.9, 1.10

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/video

Modified Files:
	Kconfig Makefile gcngx.c 
Log Message:
Merged 2.6.18.


Index: gcngx.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gcngx.c	24 Mar 2006 22:20:15 -0000	1.9
+++ gcngx.c	17 Feb 2007 23:43:41 -0000	1.10
@@ -100,7 +100,7 @@
 #define LOAD_BP_REG(x) do { FIFO_PUTU8(0x61); FIFO_PUTU32(x); } while (0)
 
 /* Static data */
-static task_t *mmap_task;
+static struct task_struct *mmap_task;
 static int overflow;
 static u32 xfb[2];
 static int currentFB = 0;

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	21 Jun 2006 18:56:06 -0000	1.18
+++ Makefile	17 Feb 2007 23:43:41 -0000	1.19
@@ -4,15 +4,16 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_VT)		  += console/
-obj-$(CONFIG_LOGO)		  += logo/
-obj-$(CONFIG_SYSFS)		  += backlight/
-
+obj-y                             += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
                                      modedb.o fbcvt.o
 fb-objs                           := $(fb-y)
 
+obj-$(CONFIG_VT)		  += console/
+obj-$(CONFIG_LOGO)		  += logo/
+obj-$(CONFIG_SYSFS)		  += backlight/
+
 obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
 obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o
@@ -38,6 +39,7 @@
 obj-$(CONFIG_FB_KYRO)             += kyro/
 obj-$(CONFIG_FB_SAVAGE)		  += savage/
 obj-$(CONFIG_FB_GEODE)		  += geode/
+obj-$(CONFIG_FB_MBX)		  += mbx/
 obj-$(CONFIG_FB_I810)             += vgastate.o
 obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o
 obj-$(CONFIG_FB_VIRGE)            += virgefb.o
@@ -94,10 +96,14 @@
 obj-$(CONFIG_FB_S1D13XXX)	  += s1d13xxxfb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)	  += s3c2410fb.o
-obj-$(CONFIG_FB_GAMECUBE)	  += gcnfb.o gcngx.o
+obj-$(CONFIG_FB_PNX4008_DUM)	  += pnx4008/
+obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
+obj-$(CONFIG_FB_GAMECUBE)	  += gcnfb.o
+obj-$(CONFIG_FB_GAMECUBE_GX)	  += gcngx.o
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o
+obj-$(CONFIG_FB_IMAC)             += imacfb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
 obj-$(CONFIG_FB_OF)               += offb.o
 

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Kconfig	21 Jun 2006 18:56:06 -0000	1.19
+++ Kconfig	17 Feb 2007 23:43:41 -0000	1.20
@@ -4,6 +4,21 @@
 
 menu "Graphics support"
 
+config FIRMWARE_EDID
+       bool "Enable firmware EDID"
+       default y
+       ---help---
+         This enables access to the EDID transferred from the firmware.
+	 On the i386, this is from the Video BIOS. Enable this if DDC/I2C
+	 transfers do not work for your driver and if you are using
+	 nvidiafb, i810fb or savagefb.
+
+	 In general, choosing Y for this option is safe.  If you
+	 experience extremely long delays while booting before you get
+	 something on your display, try setting this to N.  Matrox cards in
+	 combination with certain motherboards and monitors are known to
+	 suffer from this problem.
+
 config FB
 	tristate "Support for frame buffer devices"
 	---help---
@@ -70,21 +85,12 @@
        depends on FB
        default n
 
-config FB_FIRMWARE_EDID
-       bool "Enable firmware EDID"
-       depends on FB
-       default y
-       ---help---
-         This enables access to the EDID transferred from the firmware.
-	 On the i386, this is from the Video BIOS. Enable this if DDC/I2C
-	 transfers do not work for your driver and if you are using
-	 nvidiafb, i810fb or savagefb.
-
-	 In general, choosing Y for this option is safe.  If you
-	 experience extremely long delays while booting before you get
-	 something on your display, try setting this to N.  Matrox cards in
-	 combination with certain motherboards and monitors are known to
-	 suffer from this problem.
+config FB_BACKLIGHT
+	bool
+	depends on FB
+	select BACKLIGHT_LCD_SUPPORT
+	select BACKLIGHT_CLASS_DEVICE
+	default n
 
 config FB_MODE_HELPERS
         bool "Enable Video Mode Handling Helpers"
@@ -167,6 +173,69 @@
 	  here and read <file:Documentation/modules.txt>.  The module
 	  will be called amba-clcd.
 
+choice
+
+	depends on FB_ARMCLCD && (ARCH_LH7A40X || ARCH_LH7952X)
+	prompt "LCD Panel"
+	default FB_ARMCLCD_SHARP_LQ035Q7DB02
+
+config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
+	bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
+	help
+	  This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
+	  color QVGA, HRTFT panel.  The LogicPD device includes an
+	  an integrated HRTFT controller IC.
+	  The native resolution is 240x320.
+
+config FB_ARMCLCD_SHARP_LQ057Q3DC02
+	bool "LogicPD LCD 5.7\" QVGA"
+	help
+	  This is an implementation of the Sharp LQ057Q3DC02, a 5.7"
+	  color QVGA, TFT panel.  The LogicPD device includes an
+	  The native resolution is 320x240.
+
+config FB_ARMCLCD_SHARP_LQ64D343
+	bool "LogicPD LCD 6.4\" VGA"
+	help
+	  This is an implementation of the Sharp LQ64D343, a 6.4"
+	  color VGA, TFT panel.  The LogicPD device includes an
+	  The native resolution is 640x480.
+
+config FB_ARMCLCD_SHARP_LQ10D368
+	bool "LogicPD LCD 10.4\" VGA"
+	help
+	  This is an implementation of the Sharp LQ10D368, a 10.4"
+	  color VGA, TFT panel.  The LogicPD device includes an
+	  The native resolution is 640x480.
+
+
+config FB_ARMCLCD_SHARP_LQ121S1DG41
+	bool "LogicPD LCD 12.1\" SVGA"
+	help
+	  This is an implementation of the Sharp LQ121S1DG41, a 12.1"
+	  color SVGA, TFT panel.  The LogicPD device includes an
+	  The native resolution is 800x600.
+
+	  This panel requires a clock rate may be an integer fraction
+	  of the base LCDCLK frequency.  The driver will select the
+	  highest frequency available that is lower than the maximum
+	  allowed.  The panel may flicker if the clock rate is
+	  slower than the recommended minimum.
+
+config FB_ARMCLCD_AUO_A070VW01_WIDE
+	bool "AU Optronics A070VW01 LCD 7.0\" WIDE"
+	help
+	  This is an implementation of the AU Optronics, a 7.0"
+	  WIDE Color.  The native resolution is 234x480.
+
+config FB_ARMCLCD_HITACHI
+	bool "Hitachi Wide Screen 800x480"
+	help
+	  This is an implementation of the Hitachi 800x480.
+
+endchoice
+
+
 config FB_ACORN
 	bool "Acorn VIDC support"
 	depends on (FB = y) && ARM && (ARCH_ACORN || ARCH_CLPS7500)
@@ -353,7 +422,7 @@
 
 config FB_CONTROL
 	bool "Apple \"control\" display support"
-	depends on (FB = y) && PPC_PMAC
+	depends on (FB = y) && PPC_PMAC && PPC32
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -364,7 +433,7 @@
 
 config FB_PLATINUM
 	bool "Apple \"platinum\" display support"
-	depends on (FB = y) && PPC_PMAC
+	depends on (FB = y) && PPC_PMAC && PPC32
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -375,7 +444,7 @@
 
 config FB_VALKYRIE
 	bool "Apple \"valkyrie\" display support"
-	depends on (FB = y) && (MAC || PPC_PMAC)
+	depends on (FB = y) && (MAC || (PPC_PMAC && PPC32))
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -386,7 +455,7 @@
 
 config FB_CT65550
 	bool "Chips 65550 display support"
-	depends on (FB = y) && PPC
+	depends on (FB = y) && PPC32
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -483,10 +552,14 @@
 	  You will get a boot time penguin logo at no additional cost. Please
 	  read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.
 
-config VIDEO_SELECT
-	bool
-	depends on FB_VESA
-	default y
+config FB_IMAC
+	bool "Intel-based Macintosh Framebuffer Support"
+	depends on (FB = y) && X86 && EFI
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	help
+	  This is the frame buffer device driver for the Intel-based Macintosh
 
 config FB_HGA
 	tristate "Hercules mono graphics support"
@@ -510,12 +583,6 @@
 	This will compile the Hercules mono graphics with
 	acceleration functions.
 
-
-config VIDEO_SELECT
-	bool
-	depends on (FB = y) && X86
-	default y
-
 config FB_SGIVW
 	tristate "SGI Visual Workstation framebuffer support"
 	depends on FB && X86_VISWS
@@ -654,6 +721,14 @@
 	  independently validate video mode parameters, you should say Y
 	  here.
 
+config FB_NVIDIA_BACKLIGHT
+	bool "Support for backlight control"
+	depends on FB_NVIDIA && PMAC_BACKLIGHT
+	select FB_BACKLIGHT
+	default y
+	help
+	  Say Y here if you want to control the backlight of your display.
+
 config FB_RIVA
 	tristate "nVidia Riva support"
 	depends on FB && PCI
@@ -692,6 +767,14 @@
 	  of debugging informations to provide to the maintainer when
 	  something goes wrong.
 
+config FB_RIVA_BACKLIGHT
+	bool "Support for backlight control"
+	depends on FB_RIVA && PMAC_BACKLIGHT
+	select FB_BACKLIGHT
+	default y
+	help
+	  Say Y here if you want to control the backlight of your display.
+
 config FB_I810
 	tristate "Intel 810/815 support (EXPERIMENTAL)"
 	depends on FB && EXPERIMENTAL && PCI && X86_32
@@ -743,7 +826,7 @@
 
 config FB_INTEL
 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-	depends on FB && EXPERIMENTAL && PCI && X86_32
+	depends on FB && EXPERIMENTAL && PCI && X86
 	select AGP
 	select AGP_INTEL
 	select FB_MODE_HELPERS
@@ -930,6 +1013,7 @@
 
 	  There is a product page at
 	  http://apps.ati.com/ATIcompare/
+
 config FB_RADEON_I2C
 	bool "DDC/I2C for ATI Radeon support"
 	depends on FB_RADEON
@@ -937,6 +1021,14 @@
 	help
 	  Say Y here if you want DDC/I2C support for your Radeon board. 
 
+config FB_RADEON_BACKLIGHT
+	bool "Support for backlight control"
+	depends on FB_RADEON && PMAC_BACKLIGHT
+	select FB_BACKLIGHT
+	default y
+	help
+	  Say Y here if you want to control the backlight of your display.
+
 config FB_RADEON_DEBUG
 	bool "Lots of debug output from Radeon driver"
 	depends on FB_RADEON
@@ -961,6 +1053,14 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called aty128fb.
 
+config FB_ATY128_BACKLIGHT
+	bool "Support for backlight control"
+	depends on FB_ATY128 && PMAC_BACKLIGHT
+	select FB_BACKLIGHT
+	default y
+	help
+	  Say Y here if you want to control the backlight of your display.
+
 config FB_ATY
 	tristate "ATI Mach64 display support" if PCI || ATARI
 	depends on FB && !SPARC32
@@ -1003,6 +1103,14 @@
 	  is at
 	  <http://support.ati.com/products/pc/mach64/graphics_xpression.html>.
 
+config FB_ATY_BACKLIGHT
+	bool "Support for backlight control"
+	depends on FB_ATY && PMAC_BACKLIGHT
+	select FB_BACKLIGHT
+	default y
+	help
+	  Say Y here if you want to control the backlight of your display.
+
 config FB_S3TRIO
 	bool "S3 Trio display support"
 	depends on (FB = y) && PPC && BROKEN
@@ -1417,6 +1525,26 @@
 
 	  <file:Documentation/fb/pxafb.txt> describes the available parameters.
 
+config FB_MBX
+	tristate "2700G LCD framebuffer support"
+	depends on FB && ARCH_PXA
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	---help---
+	  Framebuffer driver for the Intel 2700G (Marathon) Graphics
+	  Accelerator
+
+config FB_MBX_DEBUG
+       bool "Enable debugging info via debugfs"
+       depends on FB_MBX && DEBUG_FS
+       default n
+       ---help---
+         Enable this if you want debugging information using the debug
+         filesystem (debugfs)
+
+         If unsure, say N.
+
 config FB_W100
 	tristate "W100 frame buffer support"
 	depends on FB && PXA_SHARPSL
@@ -1456,6 +1584,21 @@
 	  Turn on debugging messages. Note that you can set/unset at run time
 	  through sysfs
 
+config FB_PNX4008_DUM
+	tristate "Display Update Module support on Philips PNX4008 board"
+	depends on FB && ARCH_PNX4008
+	---help---
+	  Say Y here to enable support for PNX4008 Display Update Module (DUM)
+
+config FB_PNX4008_DUM_RGB
+	tristate "RGB Framebuffer support on Philips PNX4008 board"
+	depends on FB_PNX4008_DUM
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	---help---
+	  Say Y here to enable support for PNX4008 RGB Framebuffer
+
 config FB_VIRTUAL
 	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
 	depends on FB
@@ -1484,7 +1627,7 @@
 	source "drivers/video/logo/Kconfig"
 endif
 
-if FB && SYSFS
+if SYSFS
 	source "drivers/video/backlight/Kconfig"
 endif
 

[Gc-linux-cvs] linux/fs Kconfig,1.3,1.4 Makefile,1.3,1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/fs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/fs

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.18.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	21 Jun 2006 18:56:06 -0000	1.3
+++ Makefile	17 Feb 2007 23:43:41 -0000	1.4
@@ -13,6 +13,7 @@
 		ioprio.o pnode.o drop_caches.o splice.o sync.o
 
 obj-$(CONFIG_INOTIFY)		+= inotify.o
+obj-$(CONFIG_INOTIFY_USER)	+= inotify_user.o
 obj-$(CONFIG_EPOLL)		+= eventpoll.o
 obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o
 
@@ -65,8 +66,7 @@
 obj-$(CONFIG_VFAT_FS)		+= vfat/
 obj-$(CONFIG_BFS_FS)		+= bfs/
 obj-$(CONFIG_ISO9660_FS)	+= isofs/
-obj-$(CONFIG_GCDVD_FS)          += gcdvdfs/
-obj-$(CONFIG_DEVFS_FS)		+= devfs/
+obj-$(CONFIG_GCDVD_FS)		+= gcdvdfs/
 obj-$(CONFIG_HFSPLUS_FS)	+= hfsplus/ # Before hfs to find wrapped HFS+
 obj-$(CONFIG_HFS_FS)		+= hfs/
 obj-$(CONFIG_VXFS_FS)		+= freevxfs/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig	21 Jun 2006 18:56:06 -0000	1.3
+++ Kconfig	17 Feb 2007 23:43:41 -0000	1.4
@@ -53,7 +53,7 @@
 
 config EXT2_FS_XIP
 	bool "Ext2 execute in place support"
-	depends on EXT2_FS
+	depends on EXT2_FS && MMU
 	help
 	  Execute in place can be used on memory-backed block devices. If you
 	  enable this option, you can select to mount block devices which are
@@ -326,7 +326,7 @@
 
 config OCFS2_FS
 	tristate "OCFS2 file system support (EXPERIMENTAL)"
-	depends on NET && EXPERIMENTAL
+	depends on NET && SYSFS && EXPERIMENTAL
 	select CONFIGFS_FS
 	select JBD
 	select CRC32
@@ -356,6 +356,16 @@
 	          - POSIX ACLs
 	          - readpages / writepages (not user visible)
 
+config OCFS2_DEBUG_MASKLOG
+	bool "OCFS2 logging support"
+	depends on OCFS2_FS
+	default y
+	help
+	  The ocfs2 filesystem has an extensive logging system.  The system
+	  allows selection of events to log via files in /sys/o2cb/logmask/.
+	  This option will enlarge your kernel, but it allows debugging of
+	  ocfs2 filesystem issues.
+
 config MINIX_FS
 	tristate "Minix fs support"
 	help
@@ -393,18 +403,30 @@
 	bool "Inotify file change notification support"
 	default y
 	---help---
-	  Say Y here to enable inotify support and the associated system
-	  calls.  Inotify is a file change notification system and a
-	  replacement for dnotify.  Inotify fixes numerous shortcomings in
-	  dnotify and introduces several new features.  It allows monitoring
-	  of both files and directories via a single open fd.  Other features
-	  include multiple file events, one-shot support, and unmount
+	  Say Y here to enable inotify support.  Inotify is a file change
+	  notification system and a replacement for dnotify.  Inotify fixes
+	  numerous shortcomings in dnotify and introduces several new features
+	  including multiple file events, one-shot support, and unmount
 	  notification.
 
 	  For more information, see Documentation/filesystems/inotify.txt
 
 	  If unsure, say Y.
 
+config INOTIFY_USER
+	bool "Inotify support for userspace"
+	depends on INOTIFY
+	default y
+	---help---
+	  Say Y here to enable inotify support for userspace, including the
+	  associated system calls.  Inotify allows monitoring of both files and
+	  directories via a single open fd.  Events are read from the file
+	  descriptor, which is also select()- and poll()-able.
+
+	  For more information, see Documentation/filesystems/inotify.txt
+
+	  If unsure, say Y.
+
 config QUOTA
 	bool "Quota support"
 	help
@@ -775,7 +797,8 @@
 menu "Pseudo filesystems"
 
 config PROC_FS
-	bool "/proc file system support"
+	bool "/proc file system support" if EMBEDDED
+	default y
 	help
 	  This is a virtual file system providing information about the status
 	  of the system. "Virtual" means that it doesn't take up any space on
@@ -1112,6 +1135,44 @@
 
 	  If unsure, say 'N'.
 
+config JFFS2_FS_XATTR
+	bool "JFFS2 XATTR support (EXPERIMENTAL)"
+	depends on JFFS2_FS && EXPERIMENTAL
+	default n
+	help
+	  Extended attributes are name:value pairs associated with inodes by
+	  the kernel or by users (see the attr(5) manual page, or visit
+	  <http://acl.bestbits.at/> for details).
+	  
+	  If unsure, say N.
+
+config JFFS2_FS_POSIX_ACL
+	bool "JFFS2 POSIX Access Control Lists"
+	depends on JFFS2_FS_XATTR
+	default y
+	select FS_POSIX_ACL
+	help
+	  Posix Access Control Lists (ACLs) support permissions for users and
+	  groups beyond the owner/group/world scheme.
+	  
+	  To learn more about Access Control Lists, visit the Posix ACLs for
+	  Linux website <http://acl.bestbits.at/>.
+	  
+	  If you don't know what Access Control Lists are, say N
+
+config JFFS2_FS_SECURITY
+	bool "JFFS2 Security Labels"
+	depends on JFFS2_FS_XATTR
+	default y
+	help
+	  Security labels support alternative access control models
+	  implemented by security modules like SELinux.  This option
+	  enables an extended attribute handler for file security
+	  labels in the jffs2 filesystem.
+	  
+	  If you are not using a security module that requires using
+	  extended attributes for file security labels, say N.
+
 config JFFS2_COMPRESSION_OPTIONS
 	bool "Advanced compression options for JFFS2"
 	depends on JFFS2_FS
@@ -1331,11 +1392,19 @@
 
 config UFS_FS_WRITE
 	bool "UFS file system write support (DANGEROUS)"
-	depends on UFS_FS && EXPERIMENTAL && BROKEN
+	depends on UFS_FS && EXPERIMENTAL
 	help
 	  Say Y here if you want to try writing to UFS partitions. This is
 	  experimental, so you should back up your UFS partitions beforehand.
 
+config UFS_DEBUG
+	bool "UFS debugging"
+	depends on UFS_FS
+	help
+	  If you are experiencing any problems with the UFS filesystem, say
+	  Y here.  This will result in _many_ additional debugging messages to be
+	  written to the system log.
+
 endmenu
 
 menu "Network File Systems"
@@ -1442,7 +1511,12 @@
 	select LOCKD
 	select SUNRPC
 	select EXPORTFS
-	select NFS_ACL_SUPPORT if NFSD_V3_ACL || NFSD_V2_ACL
+	select NFSD_V2_ACL if NFSD_V3_ACL
+	select NFS_ACL_SUPPORT if NFSD_V2_ACL
+	select NFSD_TCP if NFSD_V4
+	select CRYPTO_MD5 if NFSD_V4
+	select CRYPTO if NFSD_V4
+	select FS_POSIX_ACL if NFSD_V4
 	help
 	  If you want your Linux box to act as an NFS *server*, so that other
 	  computers on your local network which support NFS can access certain
@@ -1480,7 +1554,6 @@
 config NFSD_V3_ACL
 	bool "Provide server support for the NFSv3 ACL protocol extension"
 	depends on NFSD_V3
-	select NFSD_V2_ACL
 	help
 	  Implement the NFSv3 ACL protocol extension for manipulating POSIX
 	  Access Control Lists on exported file systems. NFS clients should
@@ -1490,10 +1563,6 @@
 config NFSD_V4
 	bool "Provide NFSv4 server support (EXPERIMENTAL)"
 	depends on NFSD_V3 && EXPERIMENTAL
-	select NFSD_TCP
-	select CRYPTO_MD5
-	select CRYPTO
-	select FS_POSIX_ACL
 	help
 	  If you would like to include the NFSv4 server as well as the NFSv2
 	  and NFSv3 servers, say Y here.  This feature is experimental, and
@@ -1674,7 +1743,7 @@
 	  mounted by the cifs client to be displayed in /proc/fs/cifs/Stats
 
 config CIFS_STATS2
-	bool "CIFS extended statistics"
+	bool "Extended statistics"
 	depends on CIFS_STATS
 	help
 	  Enabling this option will allow more detailed statistics on SMB
@@ -1687,6 +1756,32 @@
 	  Unless you are a developer or are doing network performance analysis
 	  or tuning, say N.
 
+config CIFS_WEAK_PW_HASH
+	bool "Support legacy servers which use weaker LANMAN security"
+	depends on CIFS
+	help
+	  Modern CIFS servers including Samba and most Windows versions
+	  (since 1997) support stronger NTLM (and even NTLMv2 and Kerberos)
+	  security mechanisms. These hash the password more securely
+	  than the mechanisms used in the older LANMAN version of the
+          SMB protocol needed to establish sessions with old SMB servers.
+
+	  Enabling this option allows the cifs module to mount to older
+	  LANMAN based servers such as OS/2 and Windows 95, but such
+	  mounts may be less secure than mounts using NTLM or more recent
+	  security mechanisms if you are on a public network.  Unless you
+	  have a need to access old SMB servers (and are on a private 
+	  network) you probably want to say N.  Even if this support
+	  is enabled in the kernel build, they will not be used
+	  automatically. At runtime LANMAN mounts are disabled but
+	  can be set to required (or optional) either in
+	  /proc/fs/cifs (see fs/cifs/README for more detail) or via an
+	  option on the mount command. This support is disabled by 
+	  default in order to reduce the possibility of a downgrade
+	  attack.
+ 
+	  If unsure, say N.
+
 config CIFS_XATTR
         bool "CIFS extended attributes"
         depends on CIFS
@@ -1715,6 +1810,17 @@
 	  (such as Samba 3.10 and later) which can negotiate
 	  CIFS POSIX ACL support.  If unsure, say N.
 
+config CIFS_DEBUG2
+	bool "Enable additional CIFS debugging routines"
+	depends on CIFS
+	help
+	   Enabling this option adds a few more debugging routines
+	   to the cifs code which slightly increases the size of
+	   the cifs module and can cause additional logging of debug
+	   messages in some error paths, slowing performance. This
+	   option can be turned off unless you are debugging
+	   cifs problems.  If unsure, say N.
+	   
 config CIFS_EXPERIMENTAL
 	  bool "CIFS Experimental Features (EXPERIMENTAL)"
 	  depends on CIFS && EXPERIMENTAL
@@ -1730,7 +1836,7 @@
 	    If unsure, say N.
 
 config CIFS_UPCALL
-	  bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
+	  bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
 	  depends on CIFS_EXPERIMENTAL
 	  select CONNECTOR
 	  help

[Gc-linux-cvs] linux/drivers/net Kconfig, 1.21, 1.22 Makefile, 1.18, 1.19

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/net

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.18.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	21 Jun 2006 18:56:06 -0000	1.18
+++ Makefile	17 Feb 2007 23:43:41 -0000	1.19
@@ -18,6 +18,9 @@
 		gianfar_mii.o \
 		gianfar_sysfs.o
 
+obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
+ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o
+
 #
 # link order important here
 #
@@ -187,12 +190,15 @@
 obj-$(CONFIG_MACMACE) += macmace.o
 obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_TUN) += tun.o
+obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
+obj-$(CONFIG_MYRI10GE) += myri10ge/
 obj-$(CONFIG_SMC91X) += smc91x.o
+obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
 obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Kconfig	21 Jun 2006 18:56:06 -0000	1.21
+++ Kconfig	17 Feb 2007 23:43:41 -0000	1.22
@@ -456,6 +456,7 @@
 config MIPS_AU1X00_ENET
 	bool "MIPS AU1000 Ethernet support"
 	depends on NET_ETHERNET && SOC_AU1X00
+	select PHYLIB
 	select CRC32
 	help
 	  If you have an Alchemy Semi AU1X00 based system
@@ -862,6 +863,17 @@
 	  <file:Documentation/networking/net-modules.txt>. The module
 	  will be called smc9194.
 
+config NET_NETX
+	tristate "NetX Ethernet support"
+	select MII
+	depends on NET_ETHERNET && ARCH_NETX
+	help
+	  This is support for the Hilscher netX builtin Ethernet ports
+
+	  To compile this driver as a module, choose M here and read
+	  <file:Documentation/networking/net-modules.txt>. The module
+	  will be called netx-eth.
+
 config DM9000
 	tristate "DM9000 support"
 	depends on (ARM || MIPS) && NET_ETHERNET
@@ -874,6 +886,22 @@
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
 	  called dm9000.
 
+config SMC911X
+	tristate "SMSC LAN911[5678] support"
+	select CRC32
+	select MII
+	depends on NET_ETHERNET && ARCH_PXA
+	help
+	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
+	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
+	  Say Y if you want it compiled into the kernel, 
+	  and read the Ethernet-HOWTO, available from
+	  <http://www.linuxdoc.org/docs.html#howto>.
+
+	  This driver is also available as a module. The module will be 
+	  called smc911x.  If you want to compile it as a module, say M 
+	  here and read <file:Documentation/modules.txt>
+
 config NET_VENDOR_RACAL
 	bool "Racal-Interlan (Micom) NI cards"
 	depends on NET_ETHERNET && ISA
@@ -1368,8 +1396,8 @@
 	  called apricot.
 
 config B44
-	tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)"
-	depends on NET_PCI && PCI && EXPERIMENTAL
+	tristate "Broadcom 4400 ethernet support"
+	depends on NET_PCI && PCI
 	select MII
 	help
 	  If you have a network (Ethernet) controller of this type, say Y and
@@ -1705,6 +1733,20 @@
 
 	  If unsure, say Y.
 
+config VIA_RHINE_NAPI
+	bool "Use Rx Polling (NAPI)"
+	depends on VIA_RHINE
+	help
+	  NAPI is a new driver API designed to reduce CPU and interrupt load
+	  when the driver is receiving lots of packets from the card.
+
+	  If your estimated Rx load is 10kpps or more, or if the card will be
+	  deployed on potentially unfriendly networks (e.g. in a firewall),
+	  then say Y here.
+
+	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more
+	  information.
+
 config LAN_SAA9730
 	bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
 	depends on NET_PCI && EXPERIMENTAL && MIPS
@@ -2172,6 +2214,8 @@
 config BNX2
 	tristate "Broadcom NetXtremeII support"
 	depends on PCI
+	select CRC32
+	select ZLIB_INFLATE
 	help
 	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
 
@@ -2180,7 +2224,7 @@
 
 config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
-	depends on PCI && PPC_CELL
+	depends on PCI && PPC_IBM_CELL_BLADE
 	select FW_LOADER
 	help
 	  This driver supports the Gigabit Ethernet chips present on the
@@ -2188,16 +2232,43 @@
 
 config GIANFAR
 	tristate "Gianfar Ethernet"
-	depends on 85xx || 83xx
+	depends on 85xx || 83xx || PPC_86xx
 	select PHYLIB
 	help
-	  This driver supports the Gigabit TSEC on the MPC85xx 
-	  family of chips, and the FEC on the 8540
+	  This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
+	  and MPC86xx family of chips, and the FEC on the 8540.
 
 config GFAR_NAPI
 	bool "NAPI Support"
 	depends on GIANFAR
 
+config UCC_GETH
+	tristate "Freescale QE UCC GETH"
+	depends on QUICC_ENGINE && UCC_FAST
+	help
+	  This driver supports the Gigabit Ethernet mode of QE UCC.
+	  QE can be found on MPC836x CPUs.
+
+config UGETH_NAPI
+	bool "NAPI Support"
+	depends on UCC_GETH
+
+config UGETH_MAGIC_PACKET
+	bool "Magic Packet detection support"
+	depends on UCC_GETH
+
+config UGETH_FILTERING
+	bool "Mac address filtering support"
+	depends on UCC_GETH
+
+config UGETH_TX_ON_DEMOND
+	bool "Transmit on Demond support"
+	depends on UCC_GETH
+
+config UGETH_HAS_GIGA
+	bool
+	depends on UCC_GETH && MPC836x
+
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
 	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
@@ -2320,6 +2391,23 @@
 
 	  If in doubt, say N.
 
+config MYRI10GE
+	tristate "Myricom Myri-10G Ethernet support"
+	depends on PCI
+	select FW_LOADER
+	select CRC32
+	---help---
+	  This driver supports Myricom Myri-10G Dual Protocol interface in
+	  Ethernet mode. If the eeprom on your board is not recent enough,
+	  you will need a newer firmware image.
+	  You may get this image or more information, at:
+
+	  <http://www.myri.com/scs/download-Myri10GE.html>
+
+	  To compile this driver as a module, choose M here and read
+	  <file:Documentation/networking/net-modules.txt>.  The module
+	  will be called myri10ge.
+
 endmenu
 
 source "drivers/net/tokenring/Kconfig"

[Gc-linux-cvs] linux/drivers/input/si gcn-si.c,1.4,1.5

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/input/si
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/input/si

Modified Files:
	gcn-si.c 
Log Message:
Merged 2.6.18.


Index: gcn-si.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/si/gcn-si.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gcn-si.c	24 Mar 2006 22:12:52 -0000	1.4
+++ gcn-si.c	17 Feb 2007 23:43:41 -0000	1.5
@@ -90,10 +90,10 @@
 
 
 static struct resource gcn_si_resources = {
-	DRV_MODULE_NAME,
-	0xcc006400,
-	0xcc006500,
-	IORESOURCE_MEM | IORESOURCE_BUSY
+	.start = 0xcc006400,
+	.end = 0xcc006500,
+	.name = DRV_MODULE_NAME,
+	.flags = IORESOURCE_MEM | IORESOURCE_BUSY
 };
 
 typedef struct {
@@ -151,15 +151,15 @@
 	/* clear si registers */
 
 	/* SICOUTBUF */
-	for (i = 0; i < 4; ++i)
+	for (i = 0; i < SI_MAX_PORTS; ++i)
 		writel(0, SICOUTBUF(i));
 
 	/* SICINBUFH */
-	for (i = 0; i < 4; ++i)
+	for (i = 0; i < SI_MAX_PORTS; ++i)
 		writel(0, SICINBUFH(i));
 
 	/* SICINBUFL */
-	for (i = 0; i < 4; ++i)
+	for (i = 0; i < SI_MAX_PORTS; ++i)
 		writel(0, SICINBUFL(i));
 
 	writel(0, SIPOLL);
@@ -221,7 +221,7 @@
 	unsigned long pad_bits = 0;
 	int i;
 
-	for (i = 0; i < 4; ++i) {
+	for (i = 0; i < SI_MAX_PORTS; ++i) {
 		switch (port[i].id) {
 		case CTL_PAD:
 			writel(0x00400300, SICOUTBUF(i));
@@ -284,6 +284,10 @@
 				 raw[0] & PAD_RT);
 		input_report_key(sdev->idev, BTN_START,
 				 raw[0] & PAD_START);
+		input_report_key(sdev->idev, BTN_0, raw[0] & PAD_UP);
+		input_report_key(sdev->idev, BTN_1, raw[0] & PAD_RIGHT);
+		input_report_key(sdev->idev, BTN_2, raw[0] & PAD_DOWN);
+		input_report_key(sdev->idev, BTN_3, raw[0] & PAD_LEFT);
 
 		/* axis */
 		/* a stick */
@@ -402,88 +406,91 @@
 /**
  *
  */
-static void si_setup_pad(struct input_dev *input_dev)
+static void si_setup_pad(struct input_dev *idev)
 {
-	set_bit(EV_KEY, input_dev->evbit);
-	set_bit(EV_ABS, input_dev->evbit);
-	set_bit(EV_FF, input_dev->evbit);
+	set_bit(EV_KEY, idev->evbit);
+	set_bit(EV_ABS, idev->evbit);
+	set_bit(EV_FF, idev->evbit);
 
-	set_bit(BTN_A, input_dev->keybit);
-	set_bit(BTN_B, input_dev->keybit);
-	set_bit(BTN_X, input_dev->keybit);
-	set_bit(BTN_Y, input_dev->keybit);
-	set_bit(BTN_Z, input_dev->keybit);
-	set_bit(BTN_TL, input_dev->keybit);
-	set_bit(BTN_TR, input_dev->keybit);
-	set_bit(BTN_START, input_dev->keybit);
+	set_bit(BTN_A, idev->keybit);
+	set_bit(BTN_B, idev->keybit);
+	set_bit(BTN_X, idev->keybit);
+	set_bit(BTN_Y, idev->keybit);
+	set_bit(BTN_Z, idev->keybit);
+	set_bit(BTN_TL, idev->keybit);
+	set_bit(BTN_TR, idev->keybit);
+	set_bit(BTN_START, idev->keybit);
+	set_bit(BTN_0, idev->keybit);
+	set_bit(BTN_1, idev->keybit);
+	set_bit(BTN_2, idev->keybit);
+	set_bit(BTN_3, idev->keybit);
 
 	/* a stick */
-	set_bit(ABS_X, input_dev->absbit);
-	input_dev->absmin[ABS_X] = 0;
-	input_dev->absmax[ABS_X] = 255;
-	input_dev->absfuzz[ABS_X] = 8;
-	input_dev->absflat[ABS_X] = 8;
+	set_bit(ABS_X, idev->absbit);
+	idev->absmin[ABS_X] = 0;
+	idev->absmax[ABS_X] = 255;
+	idev->absfuzz[ABS_X] = 8;
+	idev->absflat[ABS_X] = 8;
 
-	set_bit(ABS_Y, input_dev->absbit);
-	input_dev->absmin[ABS_Y] = 0;
-	input_dev->absmax[ABS_Y] = 255;
-	input_dev->absfuzz[ABS_Y] = 8;
-	input_dev->absflat[ABS_Y] = 8;
+	set_bit(ABS_Y, idev->absbit);
+	idev->absmin[ABS_Y] = 0;
+	idev->absmax[ABS_Y] = 255;
+	idev->absfuzz[ABS_Y] = 8;
+	idev->absflat[ABS_Y] = 8;
 
 	/* b pad */
-	set_bit(ABS_HAT0X, input_dev->absbit);
-	input_dev->absmin[ABS_HAT0X] = -1;
-	input_dev->absmax[ABS_HAT0X] = 1;
+	set_bit(ABS_HAT0X, idev->absbit);
+	idev->absmin[ABS_HAT0X] = -1;
+	idev->absmax[ABS_HAT0X] = 1;
 
-	set_bit(ABS_HAT0Y, input_dev->absbit);
-	input_dev->absmin[ABS_HAT0Y] = -1;
-	input_dev->absmax[ABS_HAT0Y] = 1;
+	set_bit(ABS_HAT0Y, idev->absbit);
+	idev->absmin[ABS_HAT0Y] = -1;
+	idev->absmax[ABS_HAT0Y] = 1;
 
 	/* c stick */
-	set_bit(ABS_RX, input_dev->absbit);
-	input_dev->absmin[ABS_RX] = 0;
-	input_dev->absmax[ABS_RX] = 255;
-	input_dev->absfuzz[ABS_RX] = 8;
-	input_dev->absflat[ABS_RX] = 8;
+	set_bit(ABS_RX, idev->absbit);
+	idev->absmin[ABS_RX] = 0;
+	idev->absmax[ABS_RX] = 255;
+	idev->absfuzz[ABS_RX] = 8;
+	idev->absflat[ABS_RX] = 8;
 
-	set_bit(ABS_RY, input_dev->absbit);
-	input_dev->absmin[ABS_RY] = 0;
-	input_dev->absmax[ABS_RY] = 255;
-	input_dev->absfuzz[ABS_RY] = 8;
-	input_dev->absflat[ABS_RY] = 8;
+	set_bit(ABS_RY, idev->absbit);
+	idev->absmin[ABS_RY] = 0;
+	idev->absmax[ABS_RY] = 255;
+	idev->absfuzz[ABS_RY] = 8;
+	idev->absflat[ABS_RY] = 8;
 
 	/* triggers */
-	set_bit(ABS_GAS, input_dev->absbit);
-	input_dev->absmin[ABS_GAS] = -255;
-	input_dev->absmax[ABS_GAS] = 255;
-	input_dev->absfuzz[ABS_GAS] = 16;
-	input_dev->absflat[ABS_GAS] = 16;
+	set_bit(ABS_GAS, idev->absbit);
+	idev->absmin[ABS_GAS] = -255;
+	idev->absmax[ABS_GAS] = 255;
+	idev->absfuzz[ABS_GAS] = 16;
+	idev->absflat[ABS_GAS] = 16;
 
-	set_bit(ABS_BRAKE, input_dev->absbit);
-	input_dev->absmin[ABS_BRAKE] = -255;
-	input_dev->absmax[ABS_BRAKE] = 255;
-	input_dev->absfuzz[ABS_BRAKE] = 16;
-	input_dev->absflat[ABS_BRAKE] = 16;
+	set_bit(ABS_BRAKE, idev->absbit);
+	idev->absmin[ABS_BRAKE] = -255;
+	idev->absmax[ABS_BRAKE] = 255;
+	idev->absfuzz[ABS_BRAKE] = 16;
+	idev->absflat[ABS_BRAKE] = 16;
 
 	/* rumbling */
-	set_bit(FF_RUMBLE, input_dev->ffbit);
-	input_dev->event = gcn_si_event;
-
-	input_dev->ff_effects_max = 1;
+	set_bit(FF_RUMBLE, idev->ffbit);
+	idev->event = gcn_si_event;
+	idev->ff_effects_max = 1;
 }
 
 /**
  *
  */
-static void si_setup_keyboard(struct input_dev *input_dev)
+static void si_setup_keyboard(struct input_dev *idev)
 {
 	int i;
 
-	set_bit(EV_KEY, input_dev->evbit);
-	set_bit(EV_REP, input_dev->evbit);
+	set_bit(EV_KEY, idev->evbit);
+	set_bit(EV_REP, idev->evbit);
 
 	for (i = 0; i < 255; ++i)
-		set_bit(gamecube_keymap[i], input_dev->keybit);
+		set_bit(gamecube_keymap[i], idev->keybit);
 }
 
 /**
@@ -491,7 +498,7 @@
  */
 static int si_setup_device(struct si_device *sdev, int idx)
 {
-	struct input_dev *input_dev;
+	struct input_dev *idev;
 	int result = 0;
 
 	memset(sdev, 0, sizeof(*sdev));	
@@ -535,31 +542,31 @@
 		goto done;
 	}
 
-	input_dev = input_allocate_device();		
-	if (!input_dev) {
+	idev = input_allocate_device();		
+	if (!idev) {
 		si_printk(KERN_ERR, "not enough memory for input device\n");
 		result = -ENOMEM;
 		goto done;
 	}
 
-	input_dev->open = gcn_si_open;
-	input_dev->close = gcn_si_close;
-	input_dev->private = (unsigned int *)idx;
-	input_dev->name = sdev->name;
+	idev->open = gcn_si_open;
+	idev->close = gcn_si_close;
+	idev->private = (unsigned int *)idx;
+	idev->name = sdev->name;
 		
 	switch (sdev->id) {
 	case CTL_PAD:
-		si_setup_pad(input_dev);
+		si_setup_pad(idev);
 		break;
 	case CTL_KEYBOARD:
-		si_setup_keyboard(input_dev);
+		si_setup_keyboard(idev);
 		break;
 	default:
 		/* this is here to avoid compiler warnings */
 		break;
 	}
 
-	sdev->idev = input_dev;
+	sdev->idev = idev;
 
 done:
 	return result;

[Gc-linux-cvs] linux/drivers Makefile,1.16,1.17

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers

Modified Files:
	Makefile 
Log Message:
Merged 2.6.18.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	21 Jun 2006 18:56:05 -0000	1.16
+++ Makefile	17 Feb 2007 23:43:40 -0000	1.17
@@ -74,5 +74,9 @@
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
-obj-$(CONFIG_GAMECUBE_SI)	+= input/si/
+obj-$(CONFIG_GENERIC_TIME)	+= clocksource/
+obj-$(CONFIG_DMA_ENGINE)	+= dma/
+
 obj-$(CONFIG_GAMECUBE_EXI)	+= exi/
+obj-$(CONFIG_GAMECUBE_SI)	+= input/si/
+

[Gc-linux-cvs] linux/drivers/misc gcn-mi.h,1.1,1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/misc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/misc

Modified Files:
	gcn-mi.h 
Log Message:
Merged 2.6.18.


Index: gcn-mi.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-mi.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcn-mi.h	7 Jan 2005 23:39:53 -0000	1.1
+++ gcn-mi.h	17 Feb 2007 23:43:41 -0000	1.2
@@ -15,8 +15,6 @@
 #ifndef __GCN_MI_H
 #define __GCN_MI_H
 
-#ifdef CONFIG_GAMECUBE_MI
-
 #define MI_MAX_REGIONS  4
 
 #define MI_PROT_NONE 0x00
@@ -28,7 +26,5 @@
 int gcn_mi_region_unprotect(int region);
 void gcn_mi_region_unprotect_all(void);
 
-#endif /* CONFIG_GAMECUBE_MI */
-
 #endif /* __GCN_MI_H */
 

[Gc-linux-cvs] linux/drivers/block/gcn-di gcn-di.c,1.17,1.18

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/block/gcn-di

Modified Files:
	gcn-di.c 
Log Message:
Merged 2.6.18.


Index: gcn-di.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gcn-di.c	24 Mar 2006 21:45:18 -0000	1.17
+++ gcn-di.c	17 Feb 2007 23:43:40 -0000	1.18
@@ -1113,9 +1113,9 @@
 
 	/* start the block layer queue if someone requested it */
 	if (test_and_clear_bit(__DI_START_QUEUE, &ddev->flags)) {
-		spin_lock(&ddev->queue_lock);
+		spin_lock_irqsave(&ddev->queue_lock, flags);
 		blk_start_queue(ddev->queue);
-		spin_unlock(&ddev->queue_lock);
+		spin_unlock_irqrestore(&ddev->queue_lock, flags);
 	}
 
 out:
@@ -1218,14 +1218,12 @@
 		writel(cvr | DI_CVR_CVRINT, cvr_reg);
 		set_bit(__DI_MEDIA_CHANGED, &ddev->flags);
 		if (test_and_clear_bit(__DI_RESETTING, &ddev->flags)) {
-			if (!test_bit(__DI_DRIVECHIP_PRESENT, &ddev->flags)) {
-				if (ddev->flags & DI_INTEROPERABLE) {
-					DBG("extensions loaded"
-					    " and hopefully working\n");
-				} else {
-					DBG("drive reset, no extensions"
-					    " loaded yet\n");
-				}
+			if (ddev->flags & DI_INTEROPERABLE) {
+				DBG("extensions loaded"
+				    " and hopefully working\n");
+			} else {
+				DBG("drive reset, no extensions"
+				    " loaded yet\n");
 			}
 		} else {
 			DBG("dvd cover interrupt\n");
@@ -1247,6 +1245,7 @@
 
 #define FLIPPER_RESET_DVD 0x00000004
 
+	/* set flags, but preserve the drivechip flag */
 	ddev->flags = (ddev->flags & DI_DRIVECHIP_PRESENT) |
 		      DI_RESETTING | DI_MEDIA_CHANGED | DI_ALREADY_RESET;
 
@@ -1453,7 +1452,8 @@
 static u8 parking_code[] = {
 	0xa0,				/* sub	d0, d0 */
 	0xc4, 0xda, 0xfc,		/* movb	d0, (ADBCTL) */
-	0xf4, 0x74, 0x74, 0x0a, 0x08,	/* mov	0x080a74, a0 */
+	0xf4, 0x40, 0x60, 0xec, 0x40,	/* movb d0,(0x40ec60) */
+	0xf4, 0x74, 0x74, 0x0a, 0x08,	/* mov	0x080a74, a0 */ /* fixup */
 	0xf7, 0x20, 0x4c, 0x80,		/* mov	a0, (0x804c) */
 	0xfe,				/* rts */
 };
@@ -1478,7 +1478,7 @@
 
 	/* fix the parking code to match our drive model */
 	cpu_to_le32s(&irq_handler);
-	memcpy(parking_code + 6, &irq_handler, 3);
+	memcpy(parking_code + 11, &irq_handler, 3);
 
 	/* load and call it */
 	di_fw_patch_mem(ddev, load_address, parking_code, sizeof(parking_code));
@@ -1493,6 +1493,8 @@
 	if (irq_handler != original_irq_handler) {
 		di_printk(KERN_ERR, "parking failed!\n");
 		di_reset(ddev);
+	} else {
+		DBG("parking done, irq handler = %08x\n", irq_handler);
 	}
 
 	/* drive is not patched anymore here */
@@ -1537,11 +1539,11 @@
 		/* calm things down */
 		di_spin_down_drive(ddev);
 
-		di_enable_debug_commands(ddev);
-
 		/* disable any alien drive code */
+		di_enable_debug_commands(ddev);
 		di_park_firmware(ddev);
 
+		/* re-enable debug commands */
 		di_enable_debug_commands(ddev);
 
 		/* load our own drive code extensions */
@@ -1616,11 +1618,12 @@
 		di_printk(KERN_INFO, "alien drive code detected\n");
 
 		/*
-		 * Test if a xenogc is installed.
+		 * Test if a xenogc/duoq is installed.
 		 */
 		if (!di_fw_read_meml(ddev, &fingerprint, 0x40c60a)) {
 			if (fingerprint == 0xf710fff7) {
-				di_printk(KERN_INFO, "drivechip: xenogc\n");
+				di_printk(KERN_INFO, "drivechip: "
+					  "xenogc/duoq\n");
 				set_bit(__DI_DRIVECHIP_PRESENT, &ddev->flags);
 			}
 		}
@@ -1634,16 +1637,11 @@
 
 	/*
 	 * Some optimizations for a fast startup...
-	 * If a drivechip was found, avoid the initial reset.
-	 * Otherwise, try to make the drive interoperable only if the drive
+	 * Try to make the drive interoperable only if the drive
 	 * has not accepted the disc yet.
 	 */
-	if (test_bit(__DI_DRIVECHIP_PRESENT, &ddev->flags)) {
-		set_bit(__DI_ALREADY_RESET, &ddev->flags);
-	} else {
-		if (!di_is_drive_ready(ddev))
-			di_make_interoperable(ddev);
-	}
+	if (!di_is_drive_ready(ddev))
+		di_make_interoperable(ddev);
 }
 
 /*
@@ -1695,43 +1693,35 @@
 	struct di_command cmd;
 	u32 drive_status;
 
-	if (di_is_drive_ready(ddev))
-		goto out;
-
-	if (test_bit(__DI_DRIVECHIP_PRESENT, &ddev->flags)) {
-		/* with a drivechip installed resetting the drive is enough */
-		di_reset(ddev);
-		di_get_drive_status(ddev);
+	if (test_bit(__DI_INTEROPERABLE, &ddev->flags)) {
+		/* do nothing if the drive is already spinning */
+		if (di_is_drive_ready(ddev))
+			goto out;
 	} else {
-		/* first, make sure the drive is interoperable */
-		if (!(ddev->flags & DI_INTEROPERABLE))
-			di_make_interoperable(ddev);
+		di_make_interoperable(ddev);
+	}
 
-		/*
-		 * We only re-enable the extensions if the drive is not
-		 * in a pending read disk id state. Otherwise, we assume
-		 * that the drive has already accepted the disk.
-		 */
-		drive_status = di_get_drive_status(ddev);
-		if (DI_STATUS(drive_status) != 
-		    DI_STATUS_DISK_ID_NOT_READ) {
-			di_op_enableextensions(&cmd, ddev,
-					       enable_extensions);
-			di_run_command_and_wait(&cmd);
-		}
+	/*
+	 * We only re-enable the extensions if the drive is not
+	 * in a pending read disk id state. Otherwise, we assume
+	 * that the drive has already accepted the disk.
+	 */
+	drive_status = di_get_drive_status(ddev);
+	if (DI_STATUS(drive_status) != DI_STATUS_DISK_ID_NOT_READ) {
+		di_op_enableextensions(&cmd, ddev, enable_extensions);
+		di_run_command_and_wait(&cmd);
+	}
 
-		/* the spin motor command requires the debug mode */
-		di_enable_debug_commands(ddev);
+	/* the spin motor command requires the debug mode */
+	di_enable_debug_commands(ddev);
 
-		di_op_spinmotor(&cmd, ddev, DI_SPINMOTOR_UP);
-		di_run_command_and_wait(&cmd);
+	di_op_spinmotor(&cmd, ddev, DI_SPINMOTOR_UP);
+	di_run_command_and_wait(&cmd);
 
-		if (!ddev->drive_status) {
-			di_op_setstatus(&cmd, ddev, 
-					DI_STATUS_DISK_ID_NOT_READ+1);
-			cmd.cmdbuf0 |= 0x00000300; /* XXX cheqmate */
-			di_run_command_and_wait(&cmd);
-		}
+	if (!ddev->drive_status) {
+		di_op_setstatus(&cmd, ddev, DI_STATUS_DISK_ID_NOT_READ+1);
+		cmd.cmdbuf0 |= 0x00000300; /* XXX cheqmate */
+		di_run_command_and_wait(&cmd);
 	}
 out:
 	return;
@@ -1839,9 +1829,9 @@
 			add_disk_randomness(req->rq_disk);
 			end_that_request_last(req, uptodate);
 		}
-		spin_lock(&ddev->queue_lock);
+		spin_lock_irqsave(&ddev->queue_lock, flags);
 		blk_start_queue(ddev->queue);
-		spin_unlock(&ddev->queue_lock);
+		spin_unlock_irqrestore(&ddev->queue_lock, flags);
 	}
 }
 
@@ -2211,7 +2201,6 @@
 	disk->first_minor = 0;
 	disk->fops = &di_fops;
 	strcpy(disk->disk_name, DI_NAME);
-	strcpy(disk->devfs_name, disk->disk_name);
 	disk->queue = ddev->queue;
 	disk->private_data = ddev;
 	ddev->disk = disk;

[Gc-linux-cvs] linux/drivers/video/logo logo.c,1.3,1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/video/logo

Modified Files:
	logo.c 
Log Message:
Merged 2.6.18.


Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logo.c	29 Aug 2005 19:50:20 -0000	1.3
+++ logo.c	17 Feb 2007 23:43:41 -0000	1.4
@@ -9,7 +9,6 @@
  *  Copyright (C) 2003 Geert Uytterhoeven <ge...@li...>
  */
 
-#include <linux/config.h>
 #include <linux/linux_logo.h>
 #include <linux/stddef.h>
 #include <linux/module.h>

[Gc-linux-cvs] linux/drivers/block/gcn-dvd main.c,1.2,1.3

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block/gcn-dvd
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/drivers/block/gcn-dvd

Modified Files:
	main.c 
Log Message:
Merged 2.6.18.


Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-dvd/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.c	8 Apr 2005 19:42:42 -0000	1.2
+++ main.c	17 Feb 2007 23:43:40 -0000	1.3
@@ -26,6 +26,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cache.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 
 #include <linux/fcntl.h>        /* O_ACCMODE */
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
@@ -201,8 +202,7 @@
 
 inline static void sync_dma_buffer(struct dma_buffer *pRet)
 {
-	invalidate_dcache_range((unsigned long)pRet->alignedPtr,
-				(unsigned long)pRet->alignedPtr + pRet->size);
+	__dma_sync(pRet->alignedPtr, pRet->size, DMA_FROM_DEVICE);
 }
 
 inline static void free_dma_buffer(struct dma_buffer *pRet)
@@ -522,21 +522,21 @@
 	unsigned long flags;
 	struct request *req = (struct request*)cmd->param;
 	struct request_queue *rqueue = req->q;
-	enum gc_dvd_interrupt_status int_status = cmd->int_status;
+	int status;
   
 	/* since this was performed via DMA, invalidate the cache */
 	if (cmd->int_status == is_transfer_complete) {
-		invalidate_dcache_range((unsigned int)req->buffer,(unsigned int)req->buffer + cmd->r_DI_DILENGTH);
+		__dma_sync(req->buffer, cmd->r_DI_DILENGTH, DMA_FROM_DEVICE);
 	}
 	/* free this item so another request can get it */
 	gc_dvd_request_release_data(cmd);
 	/* now end the request and send back to block layer */
 	spin_lock_irqsave(rqueue->queue_lock,flags);
+	status = is_transfer_complete;
 	if (!end_that_request_first(req,
-				    (int_status == is_transfer_complete),
-				    req->current_nr_sectors)) {
+				    status, req->current_nr_sectors)) {
 		add_disk_randomness(req->rq_disk);
-		end_that_request_last(req);
+		end_that_request_last(req, status);
 	}
 	/* start queue back up */
 	blk_start_queue(rqueue);
@@ -740,7 +740,6 @@
 	dvd_gendisk->first_minor = 0;
 	dvd_gendisk->fops = &dvd_fops;
 	strcpy(dvd_gendisk->disk_name,"dvd");
-	strcpy(dvd_gendisk->devfs_name,dvd_gendisk->disk_name);
 
 	dvd_gendisk->queue = dvd_queue;
 

[Gc-linux-cvs] linux/arch/ppc/platforms Makefile,1.22,1.23

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/arch/ppc/platforms

Modified Files:
	Makefile 
Log Message:
Merged 2.6.17.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	24 Mar 2006 21:45:18 -0000	1.22
+++ Makefile	21 Jun 2006 18:56:05 -0000	1.23
@@ -2,18 +2,10 @@
 # Makefile for the linux kernel.
 #
 
-# Extra CFLAGS so we don't have to do relative includes
-CFLAGS_chrp_setup.o	+= -Iarch/$(ARCH)/mm
-
 obj-$(CONFIG_APUS)		+= apus_setup.o
 ifeq ($(CONFIG_APUS),y)
 obj-$(CONFIG_PCI)		+= apus_pci.o
 endif
-obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \
-					chrp_pegasos_eth.o
-ifeq ($(CONFIG_PPC_CHRP),y)
-obj-$(CONFIG_NVRAM)		+= chrp_nvram.o
-endif
 obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
 obj-$(CONFIG_PREP_RESIDUAL)	+= residual.o
 obj-$(CONFIG_PQ2ADS)		+= pq2ads.o
@@ -37,11 +29,11 @@
 obj-$(CONFIG_SPRUCE)		+= spruce.o
 obj-$(CONFIG_LITE5200)		+= lite5200.o
 obj-$(CONFIG_EV64360)		+= ev64360.o
+obj-$(CONFIG_MPC86XADS)		+= mpc866ads_setup.o
+obj-$(CONFIG_MPC885ADS)		+= mpc885ads_setup.o
+obj-$(CONFIG_ADS8272)		+= mpc8272ads_setup.o
 obj-$(CONFIG_GAMECUBE)		+= gamecube.o
 obj-$(CONFIG_GAMECUBE_RTC)	+= gcn-rtc.o
 obj-$(CONFIG_GAMECUBE_CONSOLE)	+= gcn-con.o
 obj-$(CONFIG_GAMECUBE_RESET)	+= gcn-rsw.o
 
-ifeq ($(CONFIG_SMP),y)
-obj-$(CONFIG_PPC_CHRP)		+= chrp_smp.o
-endif

[Gc-linux-cvs] linux/drivers/video/logo Makefile,1.4,1.5

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/drivers/video/logo

Modified Files:
	Makefile 
Log Message:
Merged 2.6.17.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	24 Mar 2006 21:45:18 -0000	1.4
+++ Makefile	21 Jun 2006 18:56:06 -0000	1.5
@@ -35,7 +35,7 @@
 extra-y += $(call logo-cfiles,_gray256,pgm)
 
 # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
-quiet_cmd_logo = LOGO	$@
+quiet_cmd_logo = LOGO    $@
 	cmd_logo = scripts/pnmtologo \
 			-t $(patsubst $*_%,%,$(notdir $(basename $<))) \
 			-n $(notdir $(basename $<)) -o $@ $<

[Gc-linux-cvs] linux/drivers/block Kconfig, 1.21, 1.22 Makefile, 1.13, 1.14

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/drivers/block

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.17.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Kconfig	24 Mar 2006 21:45:18 -0000	1.21
+++ Kconfig	21 Jun 2006 18:56:06 -0000	1.22
@@ -445,8 +445,9 @@
 	  thus say N here.
 
 config BLK_DEV_RAM_COUNT
-	int "Default number of RAM disks" if BLK_DEV_RAM
+	int "Default number of RAM disks"
 	default "16"
+	depends on BLK_DEV_RAM
 	help
 	  The default value is 16 RAM disks. Change this if you know what
 	  are doing. If you boot from a filesystem that needs to be extracted
@@ -462,14 +463,16 @@
 	  8192.
 
 config BLK_DEV_INITRD
-	bool "Initial RAM disk (initrd) support"
-	depends on BLK_DEV_RAM=y
+	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
 	help
-	  The initial RAM disk is a RAM disk that is loaded by the boot loader
-	  (loadlin or lilo) and that is mounted as root before the normal boot
-	  procedure. It is typically used to load modules needed to mount the
-	  "real" root file system, etc. See <file:Documentation/initrd.txt>
-	  for details.
+	  The initial RAM filesystem is a ramfs which is loaded by the
+	  boot loader (loadlin or lilo) and that is mounted as root
+	  before the normal boot procedure. It is typically used to
+	  load modules needed to mount the "real" root file system,
+	  etc. See <file:Documentation/initrd.txt> for details.
+
+	  If RAM disk support (BLK_DEV_RAM) is also included, this
+	  also enables initial RAM disk (initrd) support.
 
 
 config CDROM_PKTCDVD

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	18 Jan 2006 23:41:52 -0000	1.13
+++ Makefile	21 Jun 2006 18:56:06 -0000	1.14
@@ -7,7 +7,6 @@
 
 obj-$(CONFIG_MAC_FLOPPY)	+= swim3.o
 obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o
-obj-$(CONFIG_BLK_DEV_FD98)	+= floppy98.o
 obj-$(CONFIG_AMIGA_FLOPPY)	+= amiflop.o
 obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
 obj-$(CONFIG_BLK_DEV_SWIM_IOP)	+= swim_iop.o

[Gc-linux-cvs] linux/include/asm-ppc io.h,1.13,1.14

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/include/asm-ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/include/asm-ppc

Modified Files:
	io.h 
Log Message:
Merged 2.6.17.


Index: io.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- io.h	24 Mar 2006 21:45:19 -0000	1.13
+++ io.h	21 Jun 2006 18:56:06 -0000	1.14
@@ -595,4 +595,11 @@
  */
 #define xlate_dev_kmem_ptr(p)	p
 
+/* access ports */
+#define setbits32(_addr, _v) out_be32((_addr), in_be32(_addr) |  (_v))
+#define clrbits32(_addr, _v) out_be32((_addr), in_be32(_addr) & ~(_v))
+
+#define setbits16(_addr, _v) out_be16((_addr), in_be16(_addr) |  (_v))
+#define clrbits16(_addr, _v) out_be16((_addr), in_be16(_addr) & ~(_v))
+
 #endif /* __KERNEL__ */

[Gc-linux-cvs] linux/drivers/video Kconfig, 1.18, 1.19 Makefile, 1.17, 1.18

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/drivers/video

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.17.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	18 Jan 2006 23:41:53 -0000	1.17
+++ Makefile	21 Jun 2006 18:56:06 -0000	1.18
@@ -39,7 +39,6 @@
 obj-$(CONFIG_FB_SAVAGE)		  += savage/
 obj-$(CONFIG_FB_GEODE)		  += geode/
 obj-$(CONFIG_FB_I810)             += vgastate.o
-obj-$(CONFIG_FB_RADEON_OLD)	  += radeonfb.o
 obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o
 obj-$(CONFIG_FB_VIRGE)            += virgefb.o
 obj-$(CONFIG_FB_3DFX)             += tdfxfb.o
@@ -86,6 +85,7 @@
 obj-$(CONFIG_FB_PXA)		  += pxafb.o
 obj-$(CONFIG_FB_W100)		  += w100fb.o
 obj-$(CONFIG_FB_AU1100)		  += au1100fb.o
+obj-$(CONFIG_FB_AU1200)		  += au1200fb.o
 obj-$(CONFIG_FB_PMAG_AA)	  += pmag-aa-fb.o
 obj-$(CONFIG_FB_PMAG_BA)	  += pmag-ba-fb.o
 obj-$(CONFIG_FB_PMAGB_B)	  += pmagb-b-fb.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Kconfig	24 Mar 2006 22:20:15 -0000	1.18
+++ Kconfig	21 Jun 2006 18:56:06 -0000	1.19
@@ -70,6 +70,22 @@
        depends on FB
        default n
 
+config FB_FIRMWARE_EDID
+       bool "Enable firmware EDID"
+       depends on FB
+       default y
+       ---help---
+         This enables access to the EDID transferred from the firmware.
+	 On the i386, this is from the Video BIOS. Enable this if DDC/I2C
+	 transfers do not work for your driver and if you are using
+	 nvidiafb, i810fb or savagefb.
+
+	 In general, choosing Y for this option is safe.  If you
+	 experience extremely long delays while booting before you get
+	 something on your display, try setting this to N.  Matrox cards in
+	 combination with certain motherboards and monitors are known to
+	 suffer from this problem.
+
 config FB_MODE_HELPERS
         bool "Enable Video Mode Handling Helpers"
         depends on FB
@@ -384,6 +400,8 @@
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
+	help
+	  This is the frame buffer device driver for the Asiliant 69030 chipset
 
 config FB_IMSTT
 	bool "IMS Twin Turbo display support"
@@ -888,20 +906,6 @@
 	  There is no need for enabling 'Matrox multihead support' if you have
 	  only one Matrox card in the box.
 
-config FB_RADEON_OLD
-	tristate "ATI Radeon display support (Old driver)"
-	depends on FB && PCI
-	select FB_CFB_FILLRECT
-	select FB_CFB_COPYAREA
-	select FB_CFB_IMAGEBLIT
-	select FB_MACMODES if PPC
-	help
-	  Choose this option if you want to use an ATI Radeon graphics card as
-	  a framebuffer device.  There are both PCI and AGP versions.  You
-	  don't need to choose this to run the Radeon in plain VGA mode.
-	  There is a product page at
-	  <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
-
 config FB_RADEON
 	tristate "ATI Radeon display support"
 	depends on FB && PCI
@@ -959,7 +963,7 @@
 
 config FB_ATY
 	tristate "ATI Mach64 display support" if PCI || ATARI
-	depends on FB
+	depends on FB && !SPARC32
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -1219,6 +1223,17 @@
 	bool "Au1100 LCD Driver"
 	depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
 
+config FB_AU1200
+	bool "Au1200 LCD Driver"
+	depends on FB && MIPS && SOC_AU1200
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	help
+	  This is the framebuffer driver for the AMD Au1200 SOC.  It can drive
+	  various panels and CRTs by passing in kernel cmd line option
+	  au1200fb:panel=<name>.
+
 source "drivers/video/geode/Kconfig"
 
 config FB_FFB

[Gc-linux-cvs] linux/drivers/net Kconfig, 1.20, 1.21 Makefile, 1.17, 1.18

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/drivers/net

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.17.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	24 Mar 2006 21:45:18 -0000	1.17
+++ Makefile	21 Jun 2006 18:56:06 -0000	1.18
@@ -58,8 +58,8 @@
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
-spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o
+spidernet-y += spider_net.o spider_net_ethtool.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SKY2) += sky2.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Kconfig	24 Mar 2006 21:45:18 -0000	1.20
+++ Kconfig	21 Jun 2006 18:56:06 -0000	1.21
@@ -66,7 +66,7 @@
 	  'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
 
 	  The driver supports multiple bonding modes to allow for both high
-	  perfomance and high availability operation.
+	  performance and high availability operation.
 
 	  Refer to <file:Documentation/networking/bonding.txt> for more
 	  information.
@@ -707,8 +707,8 @@
 	depends on NET_VENDOR_3COM && (PCI || EISA)
 	select MII
 	---help---
-	  This option enables driver support for a large number of 10mbps and
-	  10/100mbps EISA, PCI and PCMCIA 3Com network cards:
+	  This option enables driver support for a large number of 10Mbps and
+	  10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
 
 	  "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
 	  "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
@@ -1030,7 +1030,7 @@
 	depends on NET_ISA
 	---help---
 	  If you have a network (Ethernet) card of this type, say Y. This
-	  driver supports intel i82595{FX,TX} based boards. Note however
+	  driver supports Intel i82595{FX,TX} based boards. Note however
 	  that the EtherExpress PRO/100 Ethernet card has its own separate
 	  driver.  Please read the Ethernet-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
@@ -1217,7 +1217,7 @@
 	help
 	  Additional receive skb headroom. Note, that driver
 	  will always reserve at least 2 bytes to make IP header
-	  aligned, so usualy there is no need to add any additional
+	  aligned, so usually there is no need to add any additional
 	  headroom.
 	  
 	  If unsure, set to 0.
@@ -1381,8 +1381,8 @@
 	  called b44.
 
 config FORCEDETH
-	tristate "Reverse Engineered nForce Ethernet support (EXPERIMENTAL)"
-	depends on NET_PCI && PCI && EXPERIMENTAL
+	tristate "nForce Ethernet support"
+	depends on NET_PCI && PCI
 	help
 	  If you have a network (Ethernet) controller of this type, say Y and
 	  read the Ethernet-HOWTO, available from
@@ -1623,11 +1623,7 @@
 	---help---
 	  This is a driver for the Fast Ethernet PCI network cards based on
 	  the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
-	  SiS 630 and SiS 540 chipsets.  If you have one of those, say Y and
-	  read the Ethernet-HOWTO, available at
-	  <http://www.tldp.org/docs.html#howto>.  Please read
-	  <file:Documentation/networking/sis900.txt> and comments at the
-	  beginning of <file:drivers/net/sis900.c> for more information.
+	  SiS 630 and SiS 540 chipsets.
 
 	  This driver also supports AMD 79C901 HomePNA so that you can use
 	  your phone line as a network cable.
@@ -1927,7 +1923,7 @@
 	depends on E1000
 	help
 	  Say Y here if you want to use the legacy receive path for PCI express
-	  hadware.
+	  hardware.
 
 	  If in doubt, say N.
 
@@ -1943,7 +1939,7 @@
 	  will be called myri_sbus.  This is recommended.
 
 config NS83820
-	tristate "National Semiconduct DP83820 support"
+	tristate "National Semiconductor DP83820 support"
 	depends on PCI
 	help
 	  This is a driver for the National Semiconductor DP83820 series
@@ -2185,6 +2181,7 @@
 config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
 	depends on PCI && PPC_CELL
+	select FW_LOADER
 	help
 	  This driver supports the Gigabit Ethernet chips present on the
 	  Cell Processor-Based Blades from IBM.
@@ -2204,6 +2201,7 @@
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
 	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
+	select MII
 	help
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX
 	  chipset which is used in the Momenco Ocelot C and Jaguar ATX and
@@ -2324,13 +2322,11 @@
 
 endmenu
 
-if !UML
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"
-endif
 
 source "drivers/net/wan/Kconfig"
 
@@ -2523,7 +2519,7 @@
 	  Say Y here if you want to be able to filter the packets passing over
 	  PPP interfaces.  This allows you to control which packets count as
 	  activity (i.e. which packets will reset the idle timer or bring up
-	  a demand-dialled link) and which packets are to be dropped entirely.
+	  a demand-dialed link) and which packets are to be dropped entirely.
 	  You need to say Y here if you wish to use the pass-filter and
 	  active-filter options to pppd.
 
@@ -2711,8 +2707,8 @@
 	  <file:Documentation/networking/shaper.txt> for more information.
 
 	  An alternative to this traffic shaper is the experimental
-	  Class-Based Queueing (CBQ) scheduling support which you get if you
-	  say Y to "QoS and/or fair queueing" above.
+	  Class-Based Queuing (CBQ) scheduling support which you get if you
+	  say Y to "QoS and/or fair queuing" above.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called shaper.  If unsure, say N.

[Gc-linux-cvs] linux/drivers Makefile,1.15,1.16

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/drivers

Modified Files:
	Makefile 
Log Message:
Merged 2.6.17.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	24 Mar 2006 21:45:18 -0000	1.15
+++ Makefile	21 Jun 2006 18:56:05 -0000	1.16
@@ -25,9 +25,6 @@
 obj-$(CONFIG_FB_I810)           += video/i810/
 obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 
-# we also need input/serio early so serio bus is initialized by the time
-# serial drivers start registering their serio ports
-obj-$(CONFIG_SERIO)		+= input/serio/
 obj-y				+= serial/
 obj-$(CONFIG_PARPORT)		+= parport/
 obj-y				+= base/ block/ misc/ mfd/ net/ media/
@@ -53,9 +50,11 @@
 obj-$(CONFIG_USB)		+= usb/
 obj-$(CONFIG_PCI)		+= usb/
 obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
+obj-$(CONFIG_SERIO)		+= input/serio/
 obj-$(CONFIG_GAMEPORT)		+= input/gameport/
 obj-$(CONFIG_INPUT)		+= input/
 obj-$(CONFIG_I2O)		+= message/
+obj-$(CONFIG_RTC_LIB)		+= rtc/
 obj-$(CONFIG_I2C)		+= i2c/
 obj-$(CONFIG_W1)		+= w1/
 obj-$(CONFIG_HWMON)		+= hwmon/
@@ -68,7 +67,9 @@
 obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_MMC)		+= mmc/
+obj-$(CONFIG_NEW_LEDS)		+= leds/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
+obj-$(CONFIG_IPATH_CORE)	+= infiniband/
 obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/

[Gc-linux-cvs] linux/fs Kconfig,1.2,1.3 Makefile,1.2,1.3

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/fs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/fs

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.17.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	24 Mar 2006 21:45:18 -0000	1.2
+++ Makefile	21 Jun 2006 18:56:06 -0000	1.3
@@ -10,7 +10,7 @@
 		ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \
 		attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
 		seq_file.o xattr.o libfs.o fs-writeback.o mpage.o direct-io.o \
-		ioprio.o pnode.o drop_caches.o
+		ioprio.o pnode.o drop_caches.o splice.o sync.o
 
 obj-$(CONFIG_INOTIFY)		+= inotify.o
 obj-$(CONFIG_EPOLL)		+= eventpoll.o
@@ -45,6 +45,7 @@
 obj-$(CONFIG_PROC_FS)		+= proc/
 obj-y				+= partitions/
 obj-$(CONFIG_SYSFS)		+= sysfs/
+obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
 obj-y				+= devpts/
 
 obj-$(CONFIG_PROFILING)		+= dcookies.o
@@ -92,7 +93,6 @@
 obj-$(CONFIG_ADFS_FS)		+= adfs/
 obj-$(CONFIG_FUSE_FS)		+= fuse/
 obj-$(CONFIG_UDF_FS)		+= udf/
-obj-$(CONFIG_RELAYFS_FS)	+= relayfs/
 obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
 obj-$(CONFIG_JFS_FS)		+= jfs/
 obj-$(CONFIG_XFS_FS)		+= xfs/
@@ -102,5 +102,4 @@
 obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
-obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	24 Mar 2006 21:45:18 -0000	1.2
+++ Kconfig	21 Jun 2006 18:56:06 -0000	1.3
@@ -810,6 +810,7 @@
 config PROC_VMCORE
         bool "/proc/vmcore support (EXPERIMENTAL)"
         depends on PROC_FS && EXPERIMENTAL && CRASH_DUMP
+	default y
         help
         Exports the dump image of crashed kernel in ELF format.
 
@@ -852,6 +853,12 @@
 config HUGETLBFS
 	bool "HugeTLB file system support"
 	depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
+	help
+	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
+	  ramfs. For architectures that support it, say Y here and read
+	  <file:Documentation/vm/hugetlbpage.txt> for details.
+
+	  If unsure, say N.
 
 config HUGETLB_PAGE
 	def_bool HUGETLBFS
@@ -870,21 +877,9 @@
 	  To compile this as a module, choose M here: the module will be called
 	  ramfs.
 
-config RELAYFS_FS
-	tristate "Relayfs file system support"
-	---help---
-	  Relayfs is a high-speed data relay filesystem designed to provide
-	  an efficient mechanism for tools and facilities to relay large
-	  amounts of data from kernel space to user space.
-
-	  To compile this code as a module, choose M here: the module will be
-	  called relayfs.
-
-	  If unsure, say N.
-
 config CONFIGFS_FS
 	tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	depends on SYSFS && EXPERIMENTAL
 	help
 	  configfs is a ram-based filesystem that provides the converse
 	  of sysfs's functionality. Where sysfs is a filesystem-based
@@ -1578,6 +1573,7 @@
 	select CRYPTO
 	select CRYPTO_MD5
 	select CRYPTO_DES
+	select CRYPTO_CAST5
 	help
 	  Provides for secure RPC calls by means of a gss-api
 	  mechanism based on the SPKM3 public-key mechanism.

[Gc-linux-cvs] linux/arch/ppc/configs gamecube_defconfig, 1.38, 1.39

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/configs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/arch/ppc/configs

Modified Files:
	gamecube_defconfig 
Log Message:
Merged 2.6.17.


Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gamecube_defconfig	24 Mar 2006 21:45:18 -0000	1.38
+++ gamecube_defconfig	21 Jun 2006 18:56:05 -0000	1.39
@@ -1,11 +1,12 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16
-# Fri Mar 24 21:27:52 2006
+# Linux kernel version: 2.6.17
+# Sun Jun 18 17:55:08 2006
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_PPC=y
 CONFIG_PPC32=y
@@ -32,6 +33,7 @@
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
@@ -45,10 +47,6 @@
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -60,7 +58,6 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
@@ -69,6 +66,8 @@
 # Block layer
 #
 CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -89,7 +88,6 @@
 CONFIG_6xx=y
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_POWER3 is not set
 # CONFIG_8xx is not set
 # CONFIG_E200 is not set
 # CONFIG_E500 is not set
@@ -106,7 +104,7 @@
 #
 # Platform options
 #
-# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_PPC_PREP is not set
 # CONFIG_APUS is not set
 # CONFIG_KATANA is not set
 # CONFIG_WILLOW is not set
@@ -225,12 +223,15 @@
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETFILTER is not set
 
 #
@@ -532,13 +533,10 @@
 # CONFIG_GAMECUBE_MI is not set
 
 #
-# Multimedia Capabilities Port drivers
-#
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -553,12 +551,14 @@
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
+# CONFIG_FB_FIRMWARE_EDID is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_CT65550 is not set
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_GAMECUBE=y
+CONFIG_FB_GAMECUBE_GX=y
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -597,8 +597,10 @@
 CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_MIXER_OSS is not set
 CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_PCM_OSS_PLUGINS is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 
@@ -618,6 +620,7 @@
 # ALSA PowerMac requires I2C
 #
 CONFIG_SND_GAMECUBE=y
+# CONFIG_SND_GAMECUBE_MIC is not set
 
 #
 # Open Sound System
@@ -629,6 +632,7 @@
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -645,6 +649,19 @@
 # CONFIG_MMC is not set
 
 #
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
 # InfiniBand support
 #
 
@@ -653,6 +670,11 @@
 #
 
 #
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -699,7 +721,6 @@
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -797,6 +818,7 @@
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_FS is not set
 
 #
 # Security options

[Gc-linux-cvs] linux/arch/ppc/boot/simple Makefile, 1.16, 1.17 embed_config.c, 1.9, 1.10 head.S, 1.9, 1.10

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/arch/ppc/boot/simple

Modified Files:
	Makefile embed_config.c head.S 
Log Message:
Merged 2.6.17.


Index: head.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/head.S,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- head.S	31 Oct 2005 00:31:02 -0000	1.9
+++ head.S	21 Jun 2006 18:56:05 -0000	1.10
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/head.S
- *
  * Initial board bringup code for many different boards.
  *
  * Author: Tom Rini
@@ -65,6 +63,13 @@
 			 */
 #endif
 
+#if defined(CONFIG_XILINX_VIRTEX_4_FX)
+	/* PPC errata 213: only for Virtex-4 FX */
+	mfccr0  0
+	oris    0,0,0x50000000@h
+	mtccr0  0
+#endif
+
 	mflr	r3	/* Save our actual starting address. */
 
 	/* The following functions we call must not modify r3 or r4.....

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	24 Mar 2006 21:45:18 -0000	1.16
+++ Makefile	21 Jun 2006 18:56:05 -0000	1.17
@@ -196,6 +196,7 @@
 boot-$(CONFIG_GAMECUBE)		+= embed_config.o
 boot-$(CONFIG_EP405)		+= embed_config.o
 boot-$(CONFIG_XILINX_ML300)	+= embed_config.o
+boot-$(CONFIG_XILINX_ML403)	+= embed_config.o
 boot-$(CONFIG_BSEIP)		+= iic.o
 boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
 boot-$(CONFIG_MV64X60)		+= misc-mv64x60.o

Index: embed_config.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/embed_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- embed_config.c	31 Oct 2005 00:31:02 -0000	1.9
+++ embed_config.c	21 Jun 2006 18:56:05 -0000	1.10
@@ -24,6 +24,9 @@
 #ifdef CONFIG_40x
 #include <asm/io.h>
 #endif
+#ifdef CONFIG_XILINX_VIRTEX
+#include <platforms/4xx/xparameters/xparameters.h>
+#endif
 extern unsigned long timebase_period_ns;
 
 /* For those boards that don't provide one.
@@ -745,7 +748,7 @@
 }
 #endif /* WILLOW */
 
-#ifdef CONFIG_XILINX_ML300
+#if defined(CONFIG_XILINX_ML300) || defined(CONFIG_XILINX_ML403)
 void
 embed_config(bd_t ** bdp)
 {
@@ -782,7 +785,7 @@
 	timebase_period_ns = 1000000000 / bd->bi_tbfreq;
 	/* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */
 }
-#endif /* CONFIG_XILINX_ML300 */
+#endif /* CONFIG_XILINX_ML300 || CONFIG_XILINX_ML403 */
 
 #ifdef CONFIG_IBM_OPENBIOS
 /* This could possibly work for all treeboot roms.

[Gc-linux-cvs] linux/arch/ppc/boot/common util.S,1.9,1.10

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/common
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/arch/ppc/boot/common

Modified Files:
	util.S 
Log Message:
Merged 2.6.17.


Index: util.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/common/util.S,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- util.S	24 Mar 2006 21:45:18 -0000	1.9
+++ util.S	21 Jun 2006 18:56:05 -0000	1.10
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/common/util.S
- *
  * Useful bootup functions, which are more easily done in asm than C.
  *
  * NOTE:  Be very very careful about the registers you use here.

[Gc-linux-cvs] linux/arch/ppc Kconfig,1.35,1.36

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5081/arch/ppc

Modified Files:
	Kconfig 
Log Message:
Merged 2.6.17.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Kconfig	24 Mar 2006 21:45:18 -0000	1.35
+++ Kconfig	21 Jun 2006 18:56:04 -0000	1.36
@@ -19,6 +19,10 @@
 	bool
 	default y
 
+config GENERIC_HWEIGHT
+	bool
+	default y
+
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
@@ -57,15 +61,15 @@
 	select PPC_FPU
 	help
 	  There are four types of PowerPC chips supported.  The more common
-	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the IBM
-	  embedded versions (403 and 405) and the POWER3 processor.
-	  (For support for more recent 64-bit processors, set ARCH=powerpc.)
+	  types (601, 603, 604, 740, 750, 7400), the older Freescale
+	  (formerly Motorola) embedded versions (821, 823, 850, 855, 860,
+	  52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and
+	  the Book E embedded processors from IBM (44x) and Freescale (85xx).
+	  For support for 64-bit processors, set ARCH=powerpc.
 	  Unless you are building a kernel for one of the embedded processor
-	  systems or a POWER3-based IBM RS/6000, choose 6xx.
-	  Note that the kernel runs in 32-bit mode even on 64-bit chips.
-	  Also note that because the 52xx, 82xx, & 83xx family has a 603e core,
-	  specific support for that chipset is asked later on.
+	  systems, choose 6xx.
+	  Also note that because the 52xx, 82xx, & 83xx family have a 603e
+	  core, specific support for that chipset is asked later on.
 
 config 40x
 	bool "40x"
@@ -73,10 +77,6 @@
 config 44x
 	bool "44x"
 
-config POWER3
-	select PPC_FPU
-	bool "POWER3"
-
 config 8xx
 	bool "8xx"
 
@@ -248,14 +248,9 @@
 source arch/ppc/platforms/4xx/Kconfig
 source arch/ppc/platforms/85xx/Kconfig
 
-config PPC64BRIDGE
-	bool
-	depends on POWER3
-	default y
-
 config PPC_STD_MMU
 	bool
-	depends on 6xx || POWER3
+	depends on 6xx
 	default y
 
 # Although 750CXe (Gekko) seems to be cache coherent capable, the GAMECUBE
@@ -485,10 +480,57 @@
 
 endchoice
 
+menu "Freescale Ethernet driver platform-specific options"
+	depends on FS_ENET
+
+	config MPC8xx_SECOND_ETH
+	bool "Second Ethernet channel"
+	depends on (MPC885ADS || MPC86XADS)
+	default y
+	help
+	  This enables support for second Ethernet on MPC885ADS and MPC86xADS boards.
+	  The latter will use SCC1, for 885ADS you can select it below.
+
+	choice
+		prompt "Second Ethernet channel"
+		depends on MPC8xx_SECOND_ETH
+		default MPC8xx_SECOND_ETH_FEC2
+
+		config MPC8xx_SECOND_ETH_FEC2
+		bool "FEC2"
+		depends on MPC885ADS
+		help
+		  Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2
+		  (often 2-nd UART) will not work if this is enabled.
+
+		config MPC8xx_SECOND_ETH_SCC1
+		bool "SCC1"
+		depends on MPC86XADS
+		select MPC8xx_SCC_ENET_FIXED
+		help
+		  Enable SCC1 to serve as 2-nd Ethernet channel. Note that SMC1
+		  (often 1-nd UART) will not work if this is enabled.
+
+		config MPC8xx_SECOND_ETH_SCC3
+		bool "SCC3"
+		depends on MPC885ADS
+		help
+		  Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1
+		  (often 1-nd UART) will not work if this is enabled.
+
+	endchoice
+
+	config MPC8xx_SCC_ENET_FIXED
+	depends on MPC8xx_SECOND_ETH_SCC
+	default n
+	bool "Use fixed MII-less mode for SCC Ethernet"
+
+endmenu
+
 choice
 	prompt "Machine Type"
-	depends on 6xx || POWER3
-	default PPC_MULTIPLATFORM
+	depends on 6xx
+	default PPC_PREP
 	---help---
 	  Linux currently supports several different kinds of PowerPC-based
 	  machines: Apple Power Macintoshes and clones (such as the Motorola
@@ -498,15 +540,14 @@
 	  Platform) machines (including all of the recent IBM RS/6000 and
 	  pSeries machines), and several embedded PowerPC systems containing
 	  4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors.  Currently, the
-	  default option is to build a kernel which works on PReP and CHRP.
+	  default option is to build a kernel which works on PReP.
 
-	  Note that support for Apple machines is now only available with
-	  ARCH=powerpc, and has been removed from this menu.  If you wish
-	  to build a kernel for an Apple machine, exit this configuration
-	  process and re-run it with ARCH=powerpc.
+	  Note that support for Apple and CHRP machines is now only available
+	  with ARCH=powerpc, and has been removed from this menu.  If you
+	  wish to build a kernel for an Apple or CHRP machine, exit this
+	  configuration process and re-run it with ARCH=powerpc.
 
-	  Select CHRP/PReP if configuring for an IBM RS/6000 or
-	  pSeries machine, or a PReP machine.
+	  Select PReP if configuring for a PReP machine.
 
 	  Select Gemini if configuring for a Synergy Microsystems' Gemini
 	  series Single Board Computer.  More information is available at:
@@ -515,8 +556,8 @@
 	  Select APUS if configuring for a PowerUP Amiga.  More information is
 	  available at: <http://linux-apus.sourceforge.net/>.
 
-config PPC_MULTIPLATFORM
-	bool "CHRP/PReP"
+config PPC_PREP
+	bool "PReP"
 
 config APUS
 	bool "Amiga-APUS"
@@ -674,6 +715,13 @@
 	  much but it's only been tested on this board version. I think this
 	  board is also known as IceCube.
 
+config LITE5200B
+	bool "Freescale LITE5200B"
+	depends LITE5200
+	help
+	  Support for the LITE5200B dev board for the MPC5200 from Freescale.
+	  This is the new board with 2 PCI slots.
+
 config MPC834x_SYS
 	bool "Freescale MPC834x SYS"
 	help
@@ -779,25 +827,6 @@
 	  you wish to build a kernel for a machine with a CPM2 coprocessor
 	  on it (826x, 827x, 8560).
 
-config PPC_CHRP
-	bool "Support for CHRP (Common Hardware Reference Platform) machines"
-	depends on PPC_MULTIPLATFORM
-	select PPC_I8259
-	select PPC_INDIRECT_PCI
-	default y
-
-config PPC_PREP
-	bool "Support for PReP (PowerPC Reference Platform) machines"
-	depends on PPC_MULTIPLATFORM
-	select PPC_I8259
-	select PPC_INDIRECT_PCI
-	default y
-
-config PPC_OF
-	bool
-	depends on PPC_CHRP
-	default y
-
 config PPC_GEN550
 	bool
 	depends on SANDPOINT || SPRUCE || PPLUS || \
@@ -956,14 +985,6 @@
 
 source "fs/Kconfig.binfmt"
 
-config PROC_DEVICETREE
-	bool "Support for Open Firmware device tree in /proc"
-	depends on PPC_OF && PROC_FS
-	help
-	  This option adds a device-tree directory under /proc which contains
-	  an image of the device tree that the kernel copies from Open
-	  Firmware. If unsure, say Y here.
-
 config PREP_RESIDUAL
 	bool "Support for PReP Residual Data"
 	depends on PPC_PREP
@@ -1156,8 +1177,7 @@
 
 config ISA
 	bool "Support for ISA-bus hardware"
-	depends on PPC_PREP || PPC_CHRP
-	select PPC_I8259
+	depends on PPC_PREP
 	help
 	  Find out whether you have ISA slots on your motherboard.  ISA is the
 	  name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1167,18 +1187,18 @@
 
 config GENERIC_ISA_DMA
 	bool
-	depends on POWER3 || 6xx && !CPM2
+	depends on 6xx && !CPM2
 	default y
 
 config PPC_I8259
 	bool
-	default y if 85xx
+	default y if 85xx || PPC_PREP
 	default n
 
 config PPC_INDIRECT_PCI
 	bool
 	depends on PCI
-	default y if 40x || 44x || 85xx || 83xx
+	default y if 40x || 44x || 85xx || 83xx || PPC_PREP
 	default n
 
 config EISA
@@ -1371,7 +1391,7 @@
 
 config BOOT_LOAD_BOOL
 	bool "Set the boot link/load address"
-	depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
+	depends on ADVANCED_OPTIONS && !PPC_PREP
 	help
 	  This option allows you to set the initial load address of the zImage
 	  or zImage.initrd file.  This can be useful if you are on a board