---

yaml --- r: 119059 b: refs/heads/master c: 7d672cd h: refs/heads/master i: 119057: 43299b1 119055: c04ef02 v: v3
git-mirror · Nov 13, 2008 · 694ad20 · 694ad20
1 parent fbb8a71
commit 694ad20
Show file tree

Hide file tree

Showing 149 changed files with 740 additions and 1,122 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d659fc14cbd39fef625072819c6968044975fda7
+refs/heads/master: 7d672cd7506165818aacf97fdc448cffc72bde37
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -42,8 +42,14 @@ IRQ.txt
 	- description of what an IRQ is.
 ManagementStyle
 	- how to (attempt to) manage kernel hackers.
+MSI-HOWTO.txt
+	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
 RCU/
 	- directory with info on RCU (read-copy update).
+README.DAC960
+	- info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
+README.cycladesZ
+	- info on Cyclades-Z firmware loading.
 SAK.txt
 	- info on Secure Attention Keys.
 SM501.txt
@@ -80,16 +86,20 @@ blackfin/
 	- directory with documentation for the Blackfin arch.
 block/
 	- info on the Block I/O (BIO) layer.
-blockdev/
-	- info on block devices & drivers
 cachetlb.txt
 	- describes the cache/TLB flushing interfaces Linux uses.
+cciss.txt
+	- info, major/minor #'s for Compaq's SMART Array Controllers.
 cdrom/
 	- directory with information on the CD-ROM drivers that Linux has.
+computone.txt
+	- info on Computone Intelliport II/Plus Multiport Serial Driver.
 connector/
 	- docs on the netlink based userspace<->kernel space communication mod.
 console/
 	- documentation on Linux console drivers.
+cpqarray.txt
+	- info on using Compaq's SMART2 Intelligent Disk Array Controllers.
 cpu-freq/
 	- info on CPU frequency and voltage scaling.
 cpu-hotplug.txt
@@ -116,6 +126,8 @@ device-mapper/
 	- directory with info on Device Mapper.
 devices.txt
 	- plain ASCII listing of all the nodes in /dev/ with major minor #'s.
+digiepca.txt
+	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
 dontdiff
 	- file containing a list of files that should never be diff'ed.
 driver-model/
@@ -140,10 +152,14 @@ filesystems/
 	- info on the vfs and the various filesystems that Linux supports.
 firmware_class/
 	- request_firmware() hotplug interface info.
+floppy.txt
+	- notes and driver options for the floppy disk driver.
 frv/
 	- Fujitsu FR-V Linux documentation.
 gpio.txt
 	- overview of GPIO (General Purpose Input/Output) access conventions.
+hayes-esp.txt
+	- info on using the Hayes ESP serial driver.
 highuid.txt
 	- notes on the change from 16 bit to 32 bit user/group IDs.
 timers/
@@ -170,6 +186,8 @@ io_ordering.txt
 	- info on ordering I/O writes to memory-mapped addresses.
 ioctl/
 	- directory with documents describing various IOCTL calls.
+ioctl-number.txt
+	- how to implement and register device/driver ioctl calls.
 iostats.txt
 	- info on I/O statistics Linux kernel provides.
 irqflags-tracing.txt
@@ -232,10 +250,14 @@ mips/
 	- directory with info about Linux on MIPS architecture.
 mono.txt
 	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
+moxa-smartio
+	- file with info on installing/using Moxa multiport serial driver.
 mutex-design.txt
 	- info on the generic mutex subsystem.
 namespaces/
 	- directory with various information about namespaces
+nbd.txt
+	- info on a TCP implementation of a network block device.
 netlabel/
 	- directory with information on the NetLabel subsystem.
 networking/
@@ -248,6 +270,8 @@ numastat.txt
 	- info on how to read Numa policy hit/miss statistics in sysfs.
 oops-tracing.txt
 	- how to decode those nasty internal kernel error dump messages.
+paride.txt
+	- information about the parallel port IDE subsystem.
 parisc/
 	- directory with info on using Linux on PA-RISC architecture.
 parport.txt
@@ -270,12 +294,18 @@ printk-formats.txt
 	- how to get printk format specifiers right
 prio_tree.txt
 	- info on radix-priority-search-tree use for indexing vmas.
+ramdisk.txt
+	- short guide on how to set up and use the RAM disk.
 rbtree.txt
 	- info on what red-black trees are and what they are for.
+riscom8.txt
+	- notes on using the RISCom/8 multi-port serial driver.
 robust-futex-ABI.txt
 	- documentation of the robust futex ABI.
 robust-futexes.txt
 	- a description of what robust futexes are.
+rocket.txt
+	- info on the Comtrol RocketPort multiport serial driver.
 rt-mutex-design.txt
 	- description of the RealTime mutex implementation design.
 rt-mutex.txt
@@ -304,6 +334,8 @@ sparc/
 	- directory with info on using Linux on Sparc architecture.
 sparse.txt
 	- info on how to obtain and use the sparse tool for typechecking.
+specialix.txt
+	- info on hardware/driver for specialix IO8+ multiport serial card.
 spi/
 	- overview of Linux kernel Serial Peripheral Interface (SPI) support.
 spinlocks.txt
@@ -312,10 +344,14 @@ stable_api_nonsense.txt
 	- info on why the kernel does not have a stable in-kernel api or abi.
 stable_kernel_rules.txt
 	- rules and procedures for the -stable kernel releases.
+stallion.txt
+	- info on using the Stallion multiport serial driver.
 svga.txt
 	- short guide on selecting video modes at boot via VGA BIOS.
 sysfs-rules.txt
 	- How not to use sysfs.
+sx.txt
+	- info on the Specialix SX/SI multiport serial driver.
 sysctl/
 	- directory with info on the /proc/sys/* files.
 sysrq.txt
@@ -324,6 +360,8 @@ telephony/
 	- directory with info on telephony (e.g. voice over IP) support.
 time_interpolators.txt
 	- info on time interpolators.
+tty.txt
+	- guide to the locking policies of the tty layer.
 uml/
 	- directory with information about User Mode Linux.
 unicode.txt

diff --git a/trunk/Documentation/PCI/MSI-HOWTO.txt → trunk/Documentation/MSI-HOWTO.txt b/trunk/Documentation/PCI/MSI-HOWTO.txt → trunk/Documentation/MSI-HOWTO.txt
diff --git a/trunk/Documentation/PCI/00-INDEX b/trunk/Documentation/PCI/00-INDEX
@@ -1,7 +1,5 @@
 00-INDEX
 	- this file
-MSI-HOWTO.txt
-	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
 PCI-DMA-mapping.txt
 	- info for PCI drivers using DMA portably across all platforms
 PCIEBUS-HOWTO.txt

diff --git a/trunk/Documentation/blockdev/README.DAC960 → trunk/Documentation/README.DAC960 b/trunk/Documentation/blockdev/README.DAC960 → trunk/Documentation/README.DAC960
diff --git a/trunk/Documentation/serial/README.cycladesZ → trunk/Documentation/README.cycladesZ b/trunk/Documentation/serial/README.cycladesZ → trunk/Documentation/README.cycladesZ
diff --git a/trunk/Documentation/blockdev/00-INDEX b/trunk/Documentation/blockdev/00-INDEX
diff --git a/trunk/Documentation/blockdev/cciss.txt → trunk/Documentation/cciss.txt b/trunk/Documentation/blockdev/cciss.txt → trunk/Documentation/cciss.txt
diff --git a/trunk/Documentation/serial/computone.txt → trunk/Documentation/computone.txt b/trunk/Documentation/serial/computone.txt → trunk/Documentation/computone.txt
@@ -247,7 +247,7 @@ shar archive to make it easier to extract the script from the documentation.
 To create the ip2mkdev shell script change to a convenient directory (/tmp
 works just fine) and run the following command:
 
-	unshar Documentation/serial/computone.txt
+	unshar Documentation/computone.txt
 		(This file)
 
 You should now have a file ip2mkdev in your current working directory with

diff --git a/trunk/Documentation/blockdev/cpqarray.txt → trunk/Documentation/cpqarray.txt b/trunk/Documentation/blockdev/cpqarray.txt → trunk/Documentation/cpqarray.txt
diff --git a/trunk/Documentation/serial/digiepca.txt → trunk/Documentation/digiepca.txt b/trunk/Documentation/serial/digiepca.txt → trunk/Documentation/digiepca.txt
diff --git a/trunk/Documentation/blockdev/floppy.txt → trunk/Documentation/floppy.txt b/trunk/Documentation/blockdev/floppy.txt → trunk/Documentation/floppy.txt
diff --git a/trunk/Documentation/serial/hayes-esp.txt → trunk/Documentation/hayes-esp.txt b/trunk/Documentation/serial/hayes-esp.txt → trunk/Documentation/hayes-esp.txt
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt → trunk/Documentation/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt → trunk/Documentation/ioctl-number.txt
diff --git a/trunk/Documentation/ioctl/00-INDEX b/trunk/Documentation/ioctl/00-INDEX
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -629,7 +629,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	digiepca=	[HW,SERIAL]
 			See drivers/char/README.epca and
-			Documentation/serial/digiepca.txt.
+			Documentation/digiepca.txt.
 
 	disable_mtrr_cleanup [X86]
 	enable_mtrr_cleanup [X86]
@@ -740,7 +740,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See header of drivers/scsi/fdomain.c.
 
 	floppy=		[HW]
-			See Documentation/blockdev/floppy.txt.
+			See Documentation/floppy.txt.
 
 	force_pal_cache_flush
 			[IA-64] Avoid check_sal_cache_flush which may hang on
@@ -1101,7 +1101,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			the same attribute, the last one is used.
 
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
-			See Documentation/blockdev/ramdisk.txt.
+			See Documentation/ramdisk.txt.
 
 	lockd.nlm_grace_period=P  [NFS] Assign grace period.
 			Format: <integer>
@@ -1596,7 +1596,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	pcd.		[PARIDE]
 			See header of drivers/block/paride/pcd.c.
-			See also Documentation/blockdev/paride.txt.
+			See also Documentation/paride.txt.
 
 	pci=option[,option...]	[PCI] various PCI subsystem options:
 		off		[X86] don't probe for the PCI bus
@@ -1697,18 +1697,18 @@ and is between 256 and 4096 characters. It is defined in the file
 	pcmv=		[HW,PCMCIA] BadgePAD 4
 
 	pd.		[PARIDE]
-			See Documentation/blockdev/paride.txt.
+			See Documentation/paride.txt.
 
 	pdcchassis=	[PARISC,HW] Disable/Enable PDC Chassis Status codes at
 			boot time.
 			Format: { 0 | 1 }
 			See arch/parisc/kernel/pdc_chassis.c
 
 	pf.		[PARIDE]
-			See Documentation/blockdev/paride.txt.
+			See Documentation/paride.txt.
 
 	pg.		[PARIDE]
-			See Documentation/blockdev/paride.txt.
+			See Documentation/paride.txt.
 
 	pirq=		[SMP,APIC] Manual mp-table setup
 			See Documentation/x86/i386/IO-APIC.txt.
@@ -1778,7 +1778,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	prompt_ramdisk=	[RAM] List of RAM disks to prompt for floppy disk
 			before loading.
-			See Documentation/blockdev/ramdisk.txt.
+			See Documentation/ramdisk.txt.
 
 	psmouse.proto=	[HW,MOUSE] Highest PS2 mouse protocol extension to
 			probe for; one of (bare|imps|exps|lifebook|any).
@@ -1798,7 +1798,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			<io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
 
 	pt.		[PARIDE]
-			See Documentation/blockdev/paride.txt.
+			See Documentation/paride.txt.
 
 	pty.legacy_count=
 			[KNL] Number of legacy pty's. Overwrites compiled-in
@@ -1812,10 +1812,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/md.txt.
 
 	ramdisk_blocksize=	[RAM]
-			See Documentation/blockdev/ramdisk.txt.
+			See Documentation/ramdisk.txt.
 
 	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
-			See Documentation/blockdev/ramdisk.txt.
+			See Documentation/ramdisk.txt.
 
 	rcupdate.blimit=	[KNL,BOOT]
 			Set maximum number of finished RCU callbacks to process
@@ -2147,7 +2147,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/sonypi.txt
 
 	specialix=	[HW,SERIAL] Specialix multi-serial port adapter
-			See Documentation/serial/specialix.txt.
+			See Documentation/specialix.txt.
 
 	spia_io_base=	[HW,MTD]
 	spia_fio_base=

diff --git a/trunk/Documentation/serial/moxa-smartio → trunk/Documentation/moxa-smartio b/trunk/Documentation/serial/moxa-smartio → trunk/Documentation/moxa-smartio
diff --git a/trunk/Documentation/blockdev/nbd.txt → trunk/Documentation/nbd.txt b/trunk/Documentation/blockdev/nbd.txt → trunk/Documentation/nbd.txt
diff --git a/trunk/Documentation/blockdev/paride.txt → trunk/Documentation/paride.txt b/trunk/Documentation/blockdev/paride.txt → trunk/Documentation/paride.txt
diff --git a/trunk/Documentation/blockdev/ramdisk.txt → trunk/Documentation/ramdisk.txt b/trunk/Documentation/blockdev/ramdisk.txt → trunk/Documentation/ramdisk.txt
diff --git a/trunk/Documentation/serial/riscom8.txt → trunk/Documentation/riscom8.txt b/trunk/Documentation/serial/riscom8.txt → trunk/Documentation/riscom8.txt
diff --git a/trunk/Documentation/serial/rocket.txt → trunk/Documentation/rocket.txt b/trunk/Documentation/serial/rocket.txt → trunk/Documentation/rocket.txt
diff --git a/trunk/Documentation/serial/00-INDEX b/trunk/Documentation/serial/00-INDEX
diff --git a/trunk/Documentation/serial/specialix.txt → trunk/Documentation/specialix.txt b/trunk/Documentation/serial/specialix.txt → trunk/Documentation/specialix.txt
diff --git a/trunk/Documentation/serial/stallion.txt → trunk/Documentation/stallion.txt b/trunk/Documentation/serial/stallion.txt → trunk/Documentation/stallion.txt
diff --git a/trunk/Documentation/serial/sx.txt → trunk/Documentation/sx.txt b/trunk/Documentation/serial/sx.txt → trunk/Documentation/sx.txt
diff --git a/trunk/Documentation/serial/tty.txt → trunk/Documentation/tty.txt b/trunk/Documentation/serial/tty.txt → trunk/Documentation/tty.txt
diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 28
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc4
 NAME = Killer Bat of Doom
 
 # *DOCUMENTATION*

diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h
@@ -256,17 +256,8 @@ int dmabounce_sync_for_cpu(struct device *, dma_addr_t, unsigned long,
 int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long,
 		size_t, enum dma_data_direction);
 #else
-static inline int dmabounce_sync_for_cpu(struct device *d, dma_addr_t addr,
-	unsigned long offset, size_t size, enum dma_data_direction dir)
-{
-	return 1;
-}
-
-static inline int dmabounce_sync_for_device(struct device *d, dma_addr_t addr,
-	unsigned long offset, size_t size, enum dma_data_direction dir)
-{
-	return 1;
-}
+#define dmabounce_sync_for_cpu(dev,dma,off,sz,dir)	(1)
+#define dmabounce_sync_for_device(dev,dma,off,sz,dir)	(1)
 
 
 /**

diff --git a/trunk/arch/arm/include/asm/mach/map.h b/trunk/arch/arm/include/asm/mach/map.h
@@ -19,13 +19,12 @@ struct map_desc {
 };
 
 /* types 0-3 are defined in asm/io.h */
-#define MT_UNCACHED		4
-#define MT_CACHECLEAN		5
-#define MT_MINICLEAN		6
-#define MT_LOW_VECTORS		7
-#define MT_HIGH_VECTORS		8
-#define MT_MEMORY		9
-#define MT_ROM			10
+#define MT_CACHECLEAN		4
+#define MT_MINICLEAN		5
+#define MT_LOW_VECTORS		6
+#define MT_HIGH_VECTORS		7
+#define MT_MEMORY		8
+#define MT_ROM			9
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);