---

yaml --- r: 179743 b: refs/heads/master c: 0f4bd46 h: refs/heads/master i: 179741: 95eaea7 179739: 5536ccb 179735: 973be83 179727: f84b1d8 179711: fe48a44 v: v3
git-mirror · Dec 31, 2009 · 29b0de3 · 29b0de3
1 parent cd57d65
commit 29b0de3
Show file tree

Hide file tree

Showing 2,999 changed files with 53,612 additions and 125,592 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 298a4c3a57fed38df365a6807728d1930a72c728
+refs/heads/master: 0f4bd46ec252887f44f1f065b41867cac8f70dfb
diff --git a/trunk/.gitignore b/trunk/.gitignore
@@ -22,7 +22,6 @@
 *.lst
 *.symtypes
 *.order
-modules.builtin
 *.elf
 *.bin
 *.gz
@@ -37,7 +36,6 @@ modules.builtin
 tags
 TAGS
 vmlinux
-vmlinuz
 System.map
 Module.markers
 Module.symvers
@@ -47,8 +45,14 @@ Module.symvers
 #
 # Generated include files
 #
+include/asm
+include/asm-*/asm-offsets.h
 include/config
+include/linux/autoconf.h
+include/linux/compile.h
 include/linux/version.h
+include/linux/utsrelease.h
+include/linux/bounds.h
 include/generated
 
 # stgit generated dirs

diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-usb b/trunk/Documentation/ABI/testing/sysfs-bus-usb
@@ -21,27 +21,25 @@ Contact:	Alan Stern <stern@rowland.harvard.edu>
 Description:
 		Each USB device directory will contain a file named
 		power/level.  This file holds a power-level setting for
-		the device, either "on" or "auto".
+		the device, one of "on", "auto", or "suspend".
 
 		"on" means that the device is not allowed to autosuspend,
 		although normal suspends for system sleep will still
 		be honored.  "auto" means the device will autosuspend
 		and autoresume in the usual manner, according to the
-		capabilities of its driver.
+		capabilities of its driver.  "suspend" means the device
+		is forced into a suspended state and it will not autoresume
+		in response to I/O requests.  However remote-wakeup requests
+		from the device may still be enabled (the remote-wakeup
+		setting is controlled separately by the power/wakeup
+		attribute).
 
 		During normal use, devices should be left in the "auto"
-		level.  The "on" level is meant for administrative uses.
+		level.  The other levels are meant for administrative uses.
 		If you want to suspend a device immediately but leave it
 		free to wake up in response to I/O requests, you should
 		write "0" to power/autosuspend.
 
-		Device not capable of proper suspend and resume should be
-		left in the "on" level.  Although the USB spec requires
-		devices to support suspend/resume, many of them do not.
-		In fact so many don't that by default, the USB core
-		initializes all non-hub devices in the "on" level.  Some
-		drivers may change this setting when they are bound.
-
 What:		/sys/bus/usb/devices/.../power/persist
 Date:		May 2007
 KernelVersion:	2.6.23

diff --git a/trunk/Documentation/ABI/testing/sysfs-memory-page-offline b/trunk/Documentation/ABI/testing/sysfs-memory-page-offline
diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes
@@ -49,8 +49,6 @@ o  oprofile               0.9                     # oprofiled --version
 o  udev                   081                     # udevinfo -V
 o  grub                   0.93                    # grub --version
 o  mcelog		  0.6
-o  iptables               1.4.1                   # iptables -V
-
 
 Kernel compilation
 ==================

diff --git a/trunk/Documentation/PCI/PCI-DMA-mapping.txt → trunk/Documentation/DMA-mapping.txt b/trunk/Documentation/PCI/PCI-DMA-mapping.txt → trunk/Documentation/DMA-mapping.txt
diff --git a/trunk/Documentation/DocBook/mtdnand.tmpl b/trunk/Documentation/DocBook/mtdnand.tmpl
@@ -174,15 +174,15 @@
 		</para>
 		<programlisting>
 static struct mtd_info *board_mtd;
-static void __iomem *baseaddr;
+static unsigned long baseaddr;
 		</programlisting>
 		<para>
 			Static example
 		</para>
 		<programlisting>
 static struct mtd_info board_mtd;
 static struct nand_chip board_chip;
-static void __iomem *baseaddr;
+static unsigned long baseaddr;
 		</programlisting>
 	</sect1>
 	<sect1 id="Partition_defines">
@@ -283,8 +283,8 @@ int __init board_init (void)
 	}
 
 	/* map physical address */
-	baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
-	if (!baseaddr) {
+	baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
+	if(!baseaddr){
 		printk("Ioremap to access NAND chip failed\n");
 		err = -EIO;
 		goto out_mtd;
@@ -316,7 +316,7 @@ int __init board_init (void)
 	goto out;
 
 out_ior:
-	iounmap(baseaddr);
+	iounmap((void *)baseaddr);
 out_mtd:
 	kfree (board_mtd);
 out:
@@ -341,7 +341,7 @@ static void __exit board_cleanup (void)
 	nand_release (board_mtd);
 
 	/* unmap physical address */
-	iounmap(baseaddr);
+	iounmap((void *)baseaddr);
 
 	/* Free the MTD device structure */
 	kfree (board_mtd);

diff --git a/trunk/Documentation/IO-mapping.txt b/trunk/Documentation/IO-mapping.txt
@@ -157,7 +157,7 @@ For such memory, you can do things like
 	 * access only the 640k-1MB area, so anything else
 	 * has to be remapped.
 	 */
-	void __iomem *baseptr = ioremap(0xFC000000, 1024*1024);
+	char * baseptr = ioremap(0xFC000000, 1024*1024);
 
 	/* write a 'A' to the offset 10 of the area */
 	writeb('A',baseptr+10);

diff --git a/trunk/Documentation/acpi/method-customizing.txt b/trunk/Documentation/acpi/method-customizing.txt
diff --git a/trunk/Documentation/blackfin/00-INDEX b/trunk/Documentation/blackfin/00-INDEX
@@ -1,6 +1,9 @@
 00-INDEX
 	- This file
 
+cache-lock.txt
+	- HOWTO for blackfin cache locking.
+
 cachefeatures.txt
 	- Supported cache features.
 

diff --git a/trunk/Documentation/blackfin/Makefile b/trunk/Documentation/blackfin/Makefile
diff --git a/trunk/Documentation/blackfin/cache-lock.txt b/trunk/Documentation/blackfin/cache-lock.txt
@@ -0,0 +1,48 @@
+/*
+ * File:         Documentation/blackfin/cache-lock.txt
+ * Based on:
+ * Author:
+ *
+ * Created:
+ * Description:  This file contains the simple DMA Implementation for Blackfin
+ *
+ * Rev:          $Id: cache-lock.txt 2384 2006-11-01 04:12:43Z magicyang $
+ *
+ * Modified:
+ *               Copyright 2004-2006 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ */
+
+How to lock your code in cache in uClinux/blackfin
+--------------------------------------------------
+
+There are only a few steps required to lock your code into the cache.
+Currently you can lock the code by Way.
+
+Below are the interface provided for locking the cache.
+
+
+1. cache_grab_lock(int Ways);
+
+This function grab the lock for locking your code into the cache specified
+by Ways.
+
+
+2. cache_lock(int Ways);
+
+This function should be called after your critical code has been executed.
+Once the critical code exits, the code is now loaded into the cache. This
+function locks the code into the cache.
+
+
+So, the example sequence will be:
+
+	cache_grab_lock(WAY0_L);	/* Grab the lock */
+
+	critical_code();		/* Execute the code of interest */
+
+	cache_lock(WAY0_L);		/* Lock the cache */
+
+Where WAY0_L signifies WAY0 locking.
diff --git a/trunk/Documentation/blackfin/cachefeatures.txt b/trunk/Documentation/blackfin/cachefeatures.txt
@@ -41,6 +41,16 @@
 		icplb_flush();
 		dcplb_flush();
 
+	- Locking the cache.
+
+		cache_grab_lock();
+		cache_lock();
+
+	Please refer linux-2.6.x/Documentation/blackfin/cache-lock.txt for how to
+	lock the cache.
+
+	Locking the cache is optional feature.
+
 	- Miscellaneous cache functions.
 
 		flush_cache_all();