Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45424376 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge in v2.6.14 by hand

parents 2227718c 741b2252
Loading
Loading
Loading
Loading
+260 −236
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ are specified on the kernel command line with the module name plus

	usbcore.blinkenlights=1

The text in square brackets at the beginning of the description state the
The text in square brackets at the beginning of the description states the
restrictions on the kernel for the said kernel parameter to be valid. The
restrictions referred to are that the relevant option is valid if:

@@ -71,7 +71,7 @@ restrictions referred to are that the relevant option is valid if:
	SERIAL	Serial support is enabled.
	SMP	The kernel is an SMP kernel.
	SPARC	Sparc architecture is enabled.
	SWSUSP	Software suspension is enabled.
	SWSUSP	Software suspend is enabled.
	TS	Appropriate touchscreen support is enabled.
	USB	USB support is enabled.
	USBHID	USB Human Interface Device support is enabled.
@@ -106,7 +106,7 @@ running once the system is up.
			See also Documentation/scsi/ncr53c7xx.txt.

	acpi=		[HW,ACPI] Advanced Configuration and Power Interface
			Format: { force | off | ht | strict }
			Format: { force | off | ht | strict | noirq }
			force -- enable ACPI if default was off
			off -- disable ACPI if default was on
			noirq -- do not use ACPI for IRQ routing
@@ -123,16 +123,19 @@ running once the system is up.
	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode
			Format: { level | edge | high | low }

	acpi_irq_balance	[HW,ACPI] ACPI will balance active IRQs
	acpi_irq_balance [HW,ACPI]
			ACPI will balance active IRQs
			default in APIC mode

	acpi_irq_nobalance	[HW,ACPI] ACPI will not move active IRQs (default)
	acpi_irq_nobalance [HW,ACPI]
			ACPI will not move active IRQs (default)
			default in PIC mode

	acpi_irq_pci=	[HW,ACPI] If irq_balance, Clear listed IRQs for use by PCI
	acpi_irq_pci=	[HW,ACPI] If irq_balance, clear listed IRQs for
			use by PCI
			Format: <irq>,<irq>...

	acpi_irq_isa=	[HW,ACPI] If irq_balance, Mark listed IRQs used by ISA
	acpi_irq_isa=	[HW,ACPI] If irq_balance, mark listed IRQs used by ISA
			Format: <irq>,<irq>...

	acpi_osi=	[HW,ACPI] empty param disables _OSI
@@ -145,14 +148,14 @@ running once the system is up.

	acpi_dbg_layer=	[HW,ACPI]
			Format: <int>
			Each bit of the <int> indicates an acpi debug layer,
			Each bit of the <int> indicates an ACPI debug layer,
			1: enable, 0: disable. It is useful for boot time
			debugging. After system has booted up, it can be set
			via /proc/acpi/debug_layer.

	acpi_dbg_level=	[HW,ACPI]
			Format: <int>
			Each bit of the <int> indicates an acpi debug level,
			Each bit of the <int> indicates an ACPI debug level,
			1: enable, 0: disable. It is useful for boot time
			debugging. After system has booted up, it can be set
			via /proc/acpi/debug_level.
@@ -161,12 +164,13 @@ running once the system is up.

	acpi_generic_hotkey [HW,ACPI]
			Allow consolidated generic hotkey driver to
			over-ride platform specific driver.
			override platform specific driver.
			See also Documentation/acpi-hotkey.txt.

	enable_timer_pin_1 [i386,x86-64]
			Enable PIN 1 of APIC timer
			Can be useful to work around chipset bugs (in particular on some ATI chipsets)
			Can be useful to work around chipset bugs
			(in particular on some ATI chipsets).
			The kernel tries to set a reasonable default.

	disable_timer_pin_1 [i386,x86-64]
@@ -205,10 +209,6 @@ running once the system is up.
	aic79xx=	[HW,SCSI]
			See Documentation/scsi/aic79xx.txt.

	AM53C974=	[HW,SCSI]
			Format: <host-scsi-id>,<target-scsi-id>,<max-rate>,<max-offset>
			See also header of drivers/scsi/AM53C974.c.

	amijoy.map=	[HW,JOY] Amiga joystick support
			Map of devices attached to JOY0DAT and JOY1DAT
			Format: <a>,<b>
@@ -219,7 +219,8 @@ running once the system is up.
			connected to one of 16 gameports
			Format: <type1>,<type2>,..<type16>

	apc=		[HW,SPARC] Power management functions (SPARCstation-4/5 + deriv.)
	apc=		[HW,SPARC]
			Power management functions (SPARCstation-4/5 + deriv.)
			Format: noidle
			Disable APC CPU standby support. SPARCstation-Fox does
			not play well with APC CPU idle - disable it if you have
@@ -251,7 +252,7 @@ running once the system is up.
	atkbd.reset=	[HW] Reset keyboard during initialization

	atkbd.set=	[HW] Select keyboard code set
			Format: <int> (2 = AT (default) 3 = PS/2)
			Format: <int> (2 = AT (default), 3 = PS/2)

	atkbd.scroll=	[HW] Enable scroll wheel on MS Office and similar
			keyboards
@@ -259,8 +260,8 @@ running once the system is up.
	atkbd.softraw=	[HW] Choose between synthetic and real raw mode
			Format: <bool> (0 = real, 1 = synthetic (default))

	atkbd.softrepeat=
			[HW] Use software keyboard repeat
	atkbd.softrepeat= [HW]
			Use software keyboard repeat

	autotest	[IA64]

@@ -277,11 +278,13 @@ running once the system is up.
			Format: <io>,<mode>
			See header of drivers/net/hamradio/baycom_par.c.

	baycom_ser_fdx=	[HW,AX25] BayCom Serial Port AX.25 Modem (Full Duplex Mode)
	baycom_ser_fdx=	[HW,AX25]
			BayCom Serial Port AX.25 Modem (Full Duplex Mode)
			Format: <io>,<irq>,<mode>[,<baud>]
			See header of drivers/net/hamradio/baycom_ser_fdx.c.

	baycom_ser_hdx=	[HW,AX25] BayCom Serial Port AX.25 Modem (Half Duplex Mode)
	baycom_ser_hdx=	[HW,AX25]
			BayCom Serial Port AX.25 Modem (Half Duplex Mode)
			Format: <io>,<irq>,<mode>
			See header of drivers/net/hamradio/baycom_ser_hdx.c.

@@ -292,7 +295,8 @@ running once the system is up.
	blkmtd_count=

	bttv.card=	[HW,V4L] bttv (bt848 + bt878 based grabber cards)
	bttv.radio=	Most important insmod options are available as kernel args too.
	bttv.radio=	Most important insmod options are available as
			kernel args too.
	bttv.pll=	See Documentation/video4linux/bttv/Insmod-options
	bttv.tuner=	and Documentation/video4linux/bttv/CARDLIST

@@ -318,15 +322,17 @@ running once the system is up.
	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
			Format: { "0" | "1" }
			See security/selinux/Kconfig help text.
			0 -- check protection applied by kernel (includes any implied execute protection).
			0 -- check protection applied by kernel (includes
				any implied execute protection).
			1 -- check protection requested by application.
			Default value is set via a kernel config option.
			Value can be changed at runtime via /selinux/checkreqprot.
			Value can be changed at runtime via
				/selinux/checkreqprot.

 	clock=		[BUGS=IA-32,HW] gettimeofday timesource override.
			Forces specified timesource (if avaliable) to be used
			when calculating gettimeofday(). If specicified timesource
			is not avalible, it defaults to PIT. 
			when calculating gettimeofday(). If specicified
			timesource is not avalible, it defaults to PIT.
			Format: { pit | tsc | cyclone | pmtmr }

	hpet=		[IA-32,HPET] option to disable HPET and use PIT.
@@ -336,12 +342,14 @@ running once the system is up.
			Format: { auto | [<io>,][<irq>] }

	com20020=	[HW,NET] ARCnet - COM20020 chipset
			Format: <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]]
			Format:
			<io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]]

	com90io=	[HW,NET] ARCnet - COM90xx chipset (IO-mapped buffers)
			Format: <io>[,<irq>]

	com90xx=	[HW,NET] ARCnet - COM90xx chipset (memory-mapped buffers)
	com90xx=	[HW,NET]
			ARCnet - COM90xx chipset (memory-mapped buffers)
			Format: <io>[,<irq>[,<memstart>]]

	condev=		[HW,S390] console device
@@ -367,7 +375,8 @@ running once the system is up.
			options are the same as for ttyS, above.

	cpcihp_generic=	[HW,PCI] Generic port I/O CompactPCI driver
			Format: <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
			Format:
			<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]

	cpia_pp=	[HW,PPT]
			Format: { parport<nr> | auto | none }
@@ -428,7 +437,7 @@ running once the system is up.
			earlyprintk=vga
			earlyprintk=serial[,ttySn[,baudrate]]

			Append ,keep to not disable it when the real console
			Append ",keep" to not disable it when the real console
			takes over.

			Only vga or serial at a time, not both.
@@ -463,11 +472,12 @@ running once the system is up.

	elevator=	[IOSCHED]
			Format: {"as" | "cfq" | "deadline" | "noop"}
			See Documentation/block/as-iosched.txt
			and Documentation/block/deadline-iosched.txt for details.
			See Documentation/block/as-iosched.txt and
			Documentation/block/deadline-iosched.txt for details.

	elfcorehdr=	[IA-32]
			Specifies physical address of start of kernel core image
			elf header.
			Specifies physical address of start of kernel core
			image elf header.
			See Documentation/kdump.txt for details.

	enforcing	[SELINUX] Set initial enforcing status.
@@ -532,6 +542,7 @@ running once the system is up.
	hashdist=	[KNL,NUMA] Large hashes allocated during boot
			are distributed across NUMA nodes.  Defaults on
			for IA-64, off otherwise.
			Format: 0 | 1 (for off | on)

	hcl=		[IA-64] SGI's Hardware Graph compatibility layer

@@ -661,9 +672,9 @@ running once the system is up.
			"number of CPUs in system - 1".

			This option is the preferred way to isolate CPUs. The
			alternative - manually setting the CPU mask of all tasks
			in the system can cause problems and suboptimal load
			balancer performance.
			alternative -- manually setting the CPU mask of all
			tasks in the system -- can cause problems and
			suboptimal load balancer performance.

	isp16=		[HW,CD]
			Format: <io>,<irq>,<dma>,<setup>
@@ -680,13 +691,14 @@ running once the system is up.

	l2cr=		[PPC]

	lapic		[IA-32,APIC] Enable the local APIC even if BIOS disabled it.
	lapic		[IA-32,APIC] Enable the local APIC even if BIOS
			disabled it.

	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip
			Format: addr:<io>,irq:<irq>

	llsc*=		[IA64]
			See function print_params() in arch/ia64/sn/kernel/llsc4.c.
	llsc*=		[IA64] See function print_params() in
			arch/ia64/sn/kernel/llsc4.c.

	load_ramdisk=	[RAM] List of ramdisks to load from floppy
			See Documentation/ramdisk.txt.
@@ -713,8 +725,9 @@ running once the system is up.
			7 (KERN_DEBUG)		debug-level messages

	log_buf_len=n	Sets the size of the printk ring buffer, in bytes.
			Format is n, nk, nM.  n must be a power of two.  The
			default is set in kernel config.
			Format: { n | nk | nM }
			n must be a power of two.  The default size
			is set in the kernel config file.

	lp=0		[LP]	Specify parallel ports to use, e.g,
	lp=port[,port...]	lp=none,parport0 (lp0 not configured, lp1 uses
@@ -750,18 +763,18 @@ running once the system is up.
	ltpc=		[NET]
			Format: <io>,<irq>,<dma>

	mac5380=	[HW,SCSI]
			Format: <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
	mac5380=	[HW,SCSI] Format:
			<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>

	mac53c9x=	[HW,SCSI]
			Format: <num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
	mac53c9x=	[HW,SCSI] Format:
			<num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>

	machvec=	[IA64]
			Force the use of a particular machine-vector (machvec) in a generic
			kernel.  Example: machvec=hpzx1_swiotlb
	machvec=	[IA64] Force the use of a particular machine-vector
			(machvec) in a generic kernel.
			Example: machvec=hpzx1_swiotlb

	mad16=		[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma16>,<mpu_io>,<mpu_irq>,<joystick>
	mad16=		[HW,OSS] Format:
			<io>,<irq>,<dma>,<dma16>,<mpu_io>,<mpu_irq>,<joystick>

	maui=		[HW,OSS]
			Format: <io>,<irq>
@@ -776,11 +789,11 @@ running once the system is up.
	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or
			equal to this physical address is ignored.

	max_luns=	[SCSI] Maximum number of LUNs to probe
	max_luns=	[SCSI] Maximum number of LUNs to probe.
			Should be between 1 and 2^32-1.

	max_report_luns=
			[SCSI] Maximum number of LUNs received
			[SCSI] Maximum number of LUNs received.
			Should be between 1 and 16384.

	mca-pentium	[BUGS=IA-32]
@@ -851,15 +864,15 @@ running once the system is up.
	MTD_Partition=	[MTD]
			Format: <name>,<region-number>,<size>,<offset>

	MTD_Region=	[MTD]
			Format: <name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>]
	MTD_Region=	[MTD] Format:
			<name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>]

	mtdparts=	[MTD]
			See drivers/mtd/cmdline.c.

	mtouchusb.raw_coordinates=
			[HW] Make the MicroTouch USB driver use raw coordinates ('y', default)
			or cooked coordinates ('n')
			[HW] Make the MicroTouch USB driver use raw coordinates
			('y', default) or cooked coordinates ('n')

	n2=		[NET] SDL Inc. RISCom/N2 synchronous serial card

@@ -880,6 +893,8 @@ running once the system is up.
			Format: <irq>,<io>,<mem_start>,<mem_end>,<name>
			Note that mem_start is often overloaded to mean
			something different and driver-specific.
			This usage is only documented in each driver source
			file if at all.

	nfsaddrs=	[NFS]
			See Documentation/nfsroot.txt.
@@ -948,7 +963,8 @@ running once the system is up.

	noresidual	[PPC] Don't use residual data on PReP machines.

	noresume	[SWSUSP] Disables resume and restore original swap space.
	noresume	[SWSUSP] Disables resume and restores original swap
			space.

	no-scroll	[VGA] Disables scrollback.
			This is required for the Braillex ib80-piezo Braille
@@ -972,8 +988,8 @@ running once the system is up.
	opl3sa=		[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma2>,<mpu_io>,<mpu_irq>

	opl3sa2=	[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma2>,<mss_io>,<mpu_io>,<ymode>,<loopback>[,<isapnp>,<multiple]
	opl3sa2=	[HW,OSS] Format:
			<io>,<irq>,<dma>,<dma2>,<mss_io>,<mpu_io>,<ymode>,<loopback>[,<isapnp>,<multiple]

	oprofile.timer=	[HW]
			Use timer interrupt instead of performance counters
@@ -995,33 +1011,30 @@ running once the system is up.
			0 for XT, 1 for AT (default is AT).
			Format: <mode>

	parport=0	[HW,PPT]	Specify parallel ports. 0 disables.
	parport=auto			Use 'auto' to force the driver to use
	parport=0xBBB[,IRQ[,DMA]]	any IRQ/DMA settings detected (the
					default is to ignore detected IRQ/DMA
					settings because of possible
					conflicts). You can specify the base
					address, IRQ, and DMA settings; IRQ and
					DMA should be numbers, or 'auto' (for
					using detected settings on that
					particular port), or 'nofifo' (to avoid
					using a FIFO even if it is detected).
					Parallel ports are assigned in the
					order they are specified on the command
					line, starting with parport0.

	parport_init_mode=
			[HW,PPT]	Configure VIA parallel port to
					operate in specific mode. This is
					necessary on Pegasos computer where
					firmware has no options for setting up
					parallel port mode and sets it to
					spp. Currently this function knows
					686a and 8231 chips.
	parport=	[HW,PPT] Specify parallel ports. 0 disables.
			Format: { 0 | auto | 0xBBB[,IRQ[,DMA]] }
			Use 'auto' to force the driver to use any
			IRQ/DMA settings detected (the default is to
			ignore detected IRQ/DMA settings because of
			possible conflicts). You can specify the base
			address, IRQ, and DMA settings; IRQ and DMA
			should be numbers, or 'auto' (for using detected
			settings on that particular port), or 'nofifo'
			(to avoid using a FIFO even if it is detected).
			Parallel ports are assigned in the order they
			are specified on the command line, starting
			with parport0.

	parport_init_mode=	[HW,PPT]
			Configure VIA parallel port to operate in
			a specific mode. This is necessary on Pegasos
			computer where firmware has no options for setting
			up parallel port mode and sets it to spp.
			Currently this function knows 686a and 8231 chips.
			Format: [spp|ps2|epp|ecp|ecpepp]

	pas2=		[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
	pas2=		[HW,OSS] Format:
			<io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>

	pas16=		[HW,SCSI]
			See header of drivers/scsi/pas16.c.
@@ -1041,55 +1054,58 @@ running once the system is up.
				hardware access methods are allowed. Use this
				if you experience crashes upon bootup and you
				suspect they are caused by the BIOS.
		conf1			[IA-32] Force use of PCI Configuration Mechanism 1.
		conf2			[IA-32] Force use of PCI Configuration Mechanism 2.
		conf1		[IA-32] Force use of PCI Configuration
				Mechanism 1.
		conf2		[IA-32] Force use of PCI Configuration
				Mechanism 2.
		nosort		[IA-32] Don't sort PCI devices according to
					order given by the PCI BIOS. This sorting is done
					to get a device order compatible with older kernels.
				order given by the PCI BIOS. This sorting is
				done to get a device order compatible with
				older kernels.
		biosirq		[IA-32] Use PCI BIOS calls to get the interrupt
				routing table. These calls are known to be buggy
					on several machines and they hang the machine when used,
					but on other computers it's the only way to get the
					interrupt routing table. Try this option if the kernel
					is unable to allocate IRQs or discover secondary PCI
					buses on your motherboard.
				on several machines and they hang the machine
				when used, but on other computers it's the only
				way to get the interrupt routing table. Try
				this option if the kernel is unable to allocate
				IRQs or discover secondary PCI buses on your
				motherboard.
		rom		[IA-32] Assign address space to expansion ROMs.
					Use with caution as certain devices share address
					decoders between ROMs and other resources.
		irqmask=0xMMMM		[IA-32] Set a bit mask of IRQs allowed to be assigned
					automatically to PCI devices. You can make the kernel
					exclude IRQs of your ISA cards this way.
				Use with caution as certain devices share
				address decoders between ROMs and other
				resources.
		irqmask=0xMMMM	[IA-32] Set a bit mask of IRQs allowed to be
				assigned automatically to PCI devices. You can
				make the kernel exclude IRQs of your ISA cards
				this way.
		pirqaddr=0xAAAAA	[IA-32] Specify the physical address
				of the PIRQ table (normally generated
				by the BIOS) if it is outside the
				F0000h-100000h range.
		lastbus=N		[IA-32] Scan all buses till bus #N. Can be useful
					if the kernel is unable to find your secondary buses
					and you want to tell it explicitly which ones they are.
		lastbus=N	[IA-32] Scan all buses thru bus #N. Can be
				useful if the kernel is unable to find your
				secondary buses and you want to tell it
				explicitly which ones they are.
		assign-busses	[IA-32] Always assign all PCI bus
				numbers ourselves, overriding
					whatever the firmware may have
					done.
		usepirqmask		[IA-32] Honor the possible IRQ mask
					stored in the BIOS $PIR table. This is
					needed on some systems with broken
					BIOSes, notably some HP Pavilion N5400
					and Omnibook XE3 notebooks. This will
					have no effect if ACPI IRQ routing is
					enabled.
				whatever the firmware may have done.
		usepirqmask	[IA-32] Honor the possible IRQ mask stored
				in the BIOS $PIR table. This is needed on
				some systems with broken BIOSes, notably
				some HP Pavilion N5400 and Omnibook XE3
				notebooks. This will have no effect if ACPI
				IRQ routing is enabled.
		noacpi		[IA-32] Do not use ACPI for IRQ routing
				or for PCI scanning.
		routeirq	Do IRQ routing for all PCI devices.
				This is normally done in pci_enable_device(),
				so this option is a temporary workaround
				for broken drivers that don't call it.

		firmware		[ARM] Do not re-enumerate the bus but
					instead just use the configuration
					from the bootloader. This is currently
					used on IXP2000 systems where the
					bus has to be configured a certain way
					for adjunct CPUs.
		firmware	[ARM] Do not re-enumerate the bus but instead
				just use the configuration from the
				bootloader. This is currently used on
				IXP2000 systems where the bus has to be
				configured a certain way for adjunct CPUs.

	pcmv=		[HW,PCMCIA] BadgePAD 4

@@ -1130,14 +1146,15 @@ running once the system is up.
			Ranges are in pairs (I/O port base and size).

	pnp_reserve_mem=
			[ISAPNP] Exclude memory regions for the autoconfiguration
			[ISAPNP] Exclude memory regions for the
			autoconfiguration.
			Ranges are in pairs (memory base and size).

	profile=	[KNL] Enable kernel profiling via /proc/profile
			{ schedule | <number> }
			(param: schedule - profile schedule points}
			(param: profile step/bucket size as a power of 2 for
				statistical time based profiling)
			Format: [schedule,]<number>
			Param: "schedule" - profile schedule points.
			Param: <number> - step/bucket size as a power of 2 for
				statistical time based profiling.

	processor.max_cstate=	[HW,ACPI]
			Limit processor to maximum C-state
@@ -1148,20 +1165,21 @@ running once the system is up.
			See Documentation/ramdisk.txt.

	psmouse.proto=	[HW,MOUSE] Highest PS2 mouse protocol extension to
			probe for (bare|imps|exps|lifebook|any).
			probe for; one of (bare|imps|exps|lifebook|any).
	psmouse.rate=	[HW,MOUSE] Set desired mouse report rate, in reports
			per second.
	psmouse.resetafter=
			[HW,MOUSE] Try to reset the device after so many bad packets
	psmouse.resetafter=	[HW,MOUSE]
			Try to reset the device after so many bad packets
			(0 = never).
	psmouse.resolution=
			[HW,MOUSE] Set desired mouse resolution, in dpi.
	psmouse.smartscroll=
			[HW,MOUSE] Controls Logitech smartscroll autorepeat,
			[HW,MOUSE] Controls Logitech smartscroll autorepeat.
			0 = disabled, 1 = enabled (default).

	pss=		[HW,OSS] Personal Sound System (ECHO ESC614)
			Format: <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
			Format:
			<io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>

	pt.		[PARIDE]
			See Documentation/paride.txt.
@@ -1176,8 +1194,7 @@ running once the system is up.
	ramdisk=	[RAM] Sizes of RAM disks in kilobytes [deprecated]
			See Documentation/ramdisk.txt.

	ramdisk_blocksize=
			[RAM]
	ramdisk_blocksize=	[RAM]
			See Documentation/ramdisk.txt.

	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
@@ -1195,7 +1212,8 @@ running once the system is up.

	reserve=	[KNL,BUGS] Force the kernel to ignore some iomem area

	resume=		[SWSUSP] Specify the partition device for software suspension
	resume=		[SWSUSP]
			Specify the partition device for software suspend

	rhash_entries=	[KNL,NET]
			Set number of hash buckets for route cache
@@ -1258,8 +1276,7 @@ running once the system is up.

	serialnumber	[BUGS=IA-32]

	sg_def_reserved_size=
			[SCSI]
	sg_def_reserved_size=	[SCSI]

	sgalaxy=	[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma2>,<sgbase>
@@ -1479,14 +1496,16 @@ running once the system is up.
	tp720=		[HW,PS2]

	trix=		[HW,OSS] MediaTrix AudioTrix Pro
			Format: <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
			Format:
			<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>

	tsdev.xres=	[TS] Horizontal screen resolution.
	tsdev.yres=	[TS] Vertical screen resolution.

	turbografx.map[2|3]=
			[HW,JOY] TurboGraFX parallel port interface
			Format: <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
	turbografx.map[2|3]=	[HW,JOY]
			TurboGraFX parallel port interface
			Format:
			<port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
			See also Documentation/input/joystick-parport.txt

	u14-34f=	[HW,SCSI] UltraStor 14F/34F SCSI host adapter
@@ -1507,12 +1526,13 @@ running once the system is up.
			See Documentation/fb/modedb.txt.

	vga=		[BOOT,IA-32] Select a particular video mode
			See Documentation/i386/boot.txt and Documentation/svga.txt.
			See Documentation/i386/boot.txt and
			Documentation/svga.txt.
			Use vga=ask for menu.
			This is actually a boot loader parameter; the value is
			passed to the kernel using a special protocol.

	vmalloc=nn[KMG]	[KNL,BOOT] forces the vmalloc area to have an exact
	vmalloc=nn[KMG]	[KNL,BOOT] Forces the vmalloc area to have an exact
			size of <nn>. This can be used to increase the
			minimum size (128MB on x86). It can also be used to
			decrease the size and leave more room for directly
@@ -1538,21 +1558,25 @@ running once the system is up.
	xd_geo=		See header of drivers/block/xd.c.

	xirc2ps_cs=	[NET,PCMCIA]
			Format: <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

			Format:
			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]


______________________________________________________________________
Changelog:

	The last known update (for 2.4.0) - the changelog was not kept before.
2000-06-??	Mr. Unknown
	The last known update (for 2.4.0) - the changelog was not kept before.

2002-11-24	Petr Baudis <pasky@ucw.cz>
		Randy Dunlap <randy.dunlap@verizon.net>
	Update for 2.5.49, description for most of the options introduced,
	references to other documentation (C files, READMEs, ..), added S390,
	PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and
	reformatting.
	2002-11-24	Petr Baudis <pasky@ucw.cz>
			Randy Dunlap <randy.dunlap@verizon.net>

2005-10-19	Randy Dunlap <rdunlap@xenotime.net>
	Lots of typos, whitespace, some reformatting.

TODO:

+1 −1
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 14
EXTRAVERSION =-rc5
EXTRAVERSION =
NAME=Affluent Albatross

# *DOCUMENTATION*
+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ static int is_pxafb_device(struct device * dev, void * data)

unsigned long spitz_get_hsync_len(void)
{
#ifdef CONFIG_FB_PXA
	if (!spitz_pxafb_dev) {
		spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device);
		if (!spitz_pxafb_dev)
@@ -496,6 +497,7 @@ unsigned long spitz_get_hsync_len(void)
	if (!get_hsync_time)
		get_hsync_time = symbol_get(pxafb_get_hsync_time);
	if (!get_hsync_time)
#endif
		return 0;

	return pxafb_get_hsync_time(spitz_pxafb_dev);
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#include <kern_constants.h>

#define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS]))
#ifdef CONFIG_MODE_TT
#ifdef UML_CONFIG_MODE_TT
#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
#endif

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@

#include <kern_constants.h>

#ifdef CONFIG_MODE_TT
#ifdef UML_CONFIG_MODE_TT
#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
#endif

Loading