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

Commit e0f99893 authored by Kyle McMartin's avatar Kyle McMartin
Browse files

Auto-update from upstream

parents 6958ae31 7a4ed937
Loading
Loading
Loading
Loading
+260 −236
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ are specified on the kernel command line with the module name plus


	usbcore.blinkenlights=1
	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 on the kernel for the said kernel parameter to be valid. The
restrictions referred to are that the relevant option is valid if:
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.
	SERIAL	Serial support is enabled.
	SMP	The kernel is an SMP kernel.
	SMP	The kernel is an SMP kernel.
	SPARC	Sparc architecture is enabled.
	SPARC	Sparc architecture is enabled.
	SWSUSP	Software suspension is enabled.
	SWSUSP	Software suspend is enabled.
	TS	Appropriate touchscreen support is enabled.
	TS	Appropriate touchscreen support is enabled.
	USB	USB support is enabled.
	USB	USB support is enabled.
	USBHID	USB Human Interface Device 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.
			See also Documentation/scsi/ncr53c7xx.txt.


	acpi=		[HW,ACPI] Advanced Configuration and Power Interface
	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
			force -- enable ACPI if default was off
			off -- disable ACPI if default was on
			off -- disable ACPI if default was on
			noirq -- do not use ACPI for IRQ routing
			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
	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode
			Format: { level | edge | high | low }
			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
			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
			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>...
			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>...
			Format: <irq>,<irq>...


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


	acpi_dbg_layer=	[HW,ACPI]
	acpi_dbg_layer=	[HW,ACPI]
			Format: <int>
			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
			1: enable, 0: disable. It is useful for boot time
			debugging. After system has booted up, it can be set
			debugging. After system has booted up, it can be set
			via /proc/acpi/debug_layer.
			via /proc/acpi/debug_layer.


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


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


	enable_timer_pin_1 [i386,x86-64]
	enable_timer_pin_1 [i386,x86-64]
			Enable PIN 1 of APIC timer
			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.
			The kernel tries to set a reasonable default.


	disable_timer_pin_1 [i386,x86-64]
	disable_timer_pin_1 [i386,x86-64]
@@ -205,10 +209,6 @@ running once the system is up.
	aic79xx=	[HW,SCSI]
	aic79xx=	[HW,SCSI]
			See Documentation/scsi/aic79xx.txt.
			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
	amijoy.map=	[HW,JOY] Amiga joystick support
			Map of devices attached to JOY0DAT and JOY1DAT
			Map of devices attached to JOY0DAT and JOY1DAT
			Format: <a>,<b>
			Format: <a>,<b>
@@ -219,7 +219,8 @@ running once the system is up.
			connected to one of 16 gameports
			connected to one of 16 gameports
			Format: <type1>,<type2>,..<type16>
			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
			Format: noidle
			Disable APC CPU standby support. SPARCstation-Fox does
			Disable APC CPU standby support. SPARCstation-Fox does
			not play well with APC CPU idle - disable it if you have
			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.reset=	[HW] Reset keyboard during initialization


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


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


	autotest	[IA64]
	autotest	[IA64]


@@ -277,11 +278,13 @@ running once the system is up.
			Format: <io>,<mode>
			Format: <io>,<mode>
			See header of drivers/net/hamradio/baycom_par.c.
			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>]
			Format: <io>,<irq>,<mode>[,<baud>]
			See header of drivers/net/hamradio/baycom_ser_fdx.c.
			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>
			Format: <io>,<irq>,<mode>
			See header of drivers/net/hamradio/baycom_ser_hdx.c.
			See header of drivers/net/hamradio/baycom_ser_hdx.c.


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


	bttv.card=	[HW,V4L] bttv (bt848 + bt878 based grabber cards)
	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.pll=	See Documentation/video4linux/bttv/Insmod-options
	bttv.tuner=	and Documentation/video4linux/bttv/CARDLIST
	bttv.tuner=	and Documentation/video4linux/bttv/CARDLIST


@@ -318,15 +322,17 @@ running once the system is up.
	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
			Format: { "0" | "1" }
			Format: { "0" | "1" }
			See security/selinux/Kconfig help text.
			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.
			1 -- check protection requested by application.
			Default value is set via a kernel config option.
			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.
 	clock=		[BUGS=IA-32,HW] gettimeofday timesource override.
			Forces specified timesource (if avaliable) to be used
			Forces specified timesource (if avaliable) to be used
			when calculating gettimeofday(). If specicified timesource
			when calculating gettimeofday(). If specicified
			is not avalible, it defaults to PIT. 
			timesource is not avalible, it defaults to PIT.
			Format: { pit | tsc | cyclone | pmtmr }
			Format: { pit | tsc | cyclone | pmtmr }


	hpet=		[IA-32,HPET] option to disable HPET and use PIT.
	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>] }
			Format: { auto | [<io>,][<irq>] }


	com20020=	[HW,NET] ARCnet - COM20020 chipset
	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)
	com90io=	[HW,NET] ARCnet - COM90xx chipset (IO-mapped buffers)
			Format: <io>[,<irq>]
			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>]]
			Format: <io>[,<irq>[,<memstart>]]


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


	cpcihp_generic=	[HW,PCI] Generic port I/O CompactPCI driver
	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]
	cpia_pp=	[HW,PPT]
			Format: { parport<nr> | auto | none }
			Format: { parport<nr> | auto | none }
@@ -428,7 +437,7 @@ running once the system is up.
			earlyprintk=vga
			earlyprintk=vga
			earlyprintk=serial[,ttySn[,baudrate]]
			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.
			takes over.


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


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

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


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


	hcl=		[IA-64] SGI's Hardware Graph compatibility layer
	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".
			"number of CPUs in system - 1".


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


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


	l2cr=		[PPC]
	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
	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip
			Format: addr:<io>,irq:<irq>
			Format: addr:<io>,irq:<irq>


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


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


	log_buf_len=n	Sets the size of the printk ring buffer, in bytes.
	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
			Format: { n | nk | nM }
			default is set in kernel config.
			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=0		[LP]	Specify parallel ports to use, e.g,
	lp=port[,port...]	lp=none,parport0 (lp0 not configured, lp1 uses
	lp=port[,port...]	lp=none,parport0 (lp0 not configured, lp1 uses
@@ -750,18 +763,18 @@ running once the system is up.
	ltpc=		[NET]
	ltpc=		[NET]
			Format: <io>,<irq>,<dma>
			Format: <io>,<irq>,<dma>


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


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


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


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


	maui=		[HW,OSS]
	maui=		[HW,OSS]
			Format: <io>,<irq>
			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
	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or
			equal to this physical address is ignored.
			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.
			Should be between 1 and 2^32-1.


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


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


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


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


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


	n2=		[NET] SDL Inc. RISCom/N2 synchronous serial card
	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>
			Format: <irq>,<io>,<mem_start>,<mem_end>,<name>
			Note that mem_start is often overloaded to mean
			Note that mem_start is often overloaded to mean
			something different and driver-specific.
			something different and driver-specific.
			This usage is only documented in each driver source
			file if at all.


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


	noresidual	[PPC] Don't use residual data on PReP machines.
	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.
	no-scroll	[VGA] Disables scrollback.
			This is required for the Braillex ib80-piezo Braille
			This is required for the Braillex ib80-piezo Braille
@@ -972,8 +988,8 @@ running once the system is up.
	opl3sa=		[HW,OSS]
	opl3sa=		[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma2>,<mpu_io>,<mpu_irq>
			Format: <io>,<irq>,<dma>,<dma2>,<mpu_io>,<mpu_irq>


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


	oprofile.timer=	[HW]
	oprofile.timer=	[HW]
			Use timer interrupt instead of performance counters
			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).
			0 for XT, 1 for AT (default is AT).
			Format: <mode>
			Format: <mode>


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


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


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


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

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


	pcmv=		[HW,PCMCIA] BadgePAD 4
	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).
			Ranges are in pairs (I/O port base and size).


	pnp_reserve_mem=
	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).
			Ranges are in pairs (memory base and size).


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


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


	psmouse.proto=	[HW,MOUSE] Highest PS2 mouse protocol extension to
	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
	psmouse.rate=	[HW,MOUSE] Set desired mouse report rate, in reports
			per second.
			per second.
	psmouse.resetafter=
	psmouse.resetafter=	[HW,MOUSE]
			[HW,MOUSE] Try to reset the device after so many bad packets
			Try to reset the device after so many bad packets
			(0 = never).
			(0 = never).
	psmouse.resolution=
	psmouse.resolution=
			[HW,MOUSE] Set desired mouse resolution, in dpi.
			[HW,MOUSE] Set desired mouse resolution, in dpi.
	psmouse.smartscroll=
	psmouse.smartscroll=
			[HW,MOUSE] Controls Logitech smartscroll autorepeat,
			[HW,MOUSE] Controls Logitech smartscroll autorepeat.
			0 = disabled, 1 = enabled (default).
			0 = disabled, 1 = enabled (default).


	pss=		[HW,OSS] Personal Sound System (ECHO ESC614)
	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]
	pt.		[PARIDE]
			See Documentation/paride.txt.
			See Documentation/paride.txt.
@@ -1176,8 +1194,7 @@ running once the system is up.
	ramdisk=	[RAM] Sizes of RAM disks in kilobytes [deprecated]
	ramdisk=	[RAM] Sizes of RAM disks in kilobytes [deprecated]
			See Documentation/ramdisk.txt.
			See Documentation/ramdisk.txt.


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


	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
	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
	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]
	rhash_entries=	[KNL,NET]
			Set number of hash buckets for route cache
			Set number of hash buckets for route cache
@@ -1258,8 +1276,7 @@ running once the system is up.


	serialnumber	[BUGS=IA-32]
	serialnumber	[BUGS=IA-32]


	sg_def_reserved_size=
	sg_def_reserved_size=	[SCSI]
			[SCSI]


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


	trix=		[HW,OSS] MediaTrix AudioTrix Pro
	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.xres=	[TS] Horizontal screen resolution.
	tsdev.yres=	[TS] Vertical screen resolution.
	tsdev.yres=	[TS] Vertical screen resolution.


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


	u14-34f=	[HW,SCSI] UltraStor 14F/34F SCSI host adapter
	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.
			See Documentation/fb/modedb.txt.


	vga=		[BOOT,IA-32] Select a particular video mode
	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.
			Use vga=ask for menu.
			This is actually a boot loader parameter; the value is
			This is actually a boot loader parameter; the value is
			passed to the kernel using a special protocol.
			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
			size of <nn>. This can be used to increase the
			minimum size (128MB on x86). It can also be used to
			minimum size (128MB on x86). It can also be used to
			decrease the size and leave more room for directly
			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.
	xd_geo=		See header of drivers/block/xd.c.


	xirc2ps_cs=	[NET,PCMCIA]
	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:
Changelog:


	The last known update (for 2.4.0) - the changelog was not kept before.
2000-06-??	Mr. Unknown
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,
	Update for 2.5.49, description for most of the options introduced,
	references to other documentation (C files, READMEs, ..), added S390,
	references to other documentation (C files, READMEs, ..), added S390,
	PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and
	PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and
	reformatting.
	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:
TODO:


+2 −0
Original line number Original line 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)
unsigned long spitz_get_hsync_len(void)
{
{
#ifdef CONFIG_FB_PXA
	if (!spitz_pxafb_dev) {
	if (!spitz_pxafb_dev) {
		spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device);
		spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device);
		if (!spitz_pxafb_dev)
		if (!spitz_pxafb_dev)
@@ -496,6 +497,7 @@ unsigned long spitz_get_hsync_len(void)
	if (!get_hsync_time)
	if (!get_hsync_time)
		get_hsync_time = symbol_get(pxafb_get_hsync_time);
		get_hsync_time = symbol_get(pxafb_get_hsync_time);
	if (!get_hsync_time)
	if (!get_hsync_time)
#endif
		return 0;
		return 0;


	return pxafb_get_hsync_time(spitz_pxafb_dev);
	return pxafb_get_hsync_time(spitz_pxafb_dev);
+2 −2
Original line number Original line Diff line number Diff line
@@ -506,8 +506,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr,
	mpic->senses_count = senses_count;
	mpic->senses_count = senses_count;


	/* Map the global registers */
	/* Map the global registers */
	mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x1000);
	mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x2000);
	mpic->tmregs = mpic->gregs + (MPIC_TIMER_BASE >> 2);
	mpic->tmregs = mpic->gregs + ((MPIC_TIMER_BASE - MPIC_GREG_BASE) >> 2);
	BUG_ON(mpic->gregs == NULL);
	BUG_ON(mpic->gregs == NULL);


	/* Reset */
	/* Reset */
+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@
#include <kern_constants.h>
#include <kern_constants.h>


#define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS]))
#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]))
#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
#endif
#endif


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


#include <kern_constants.h>
#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]))
#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
#endif
#endif


Loading