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

Commit 4522d582 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

: (156 commits)
  [PATCH] x86-64: Export smp_call_function_single
  [PATCH] i386: Clean up smp_tune_scheduling()
  [PATCH] unwinder: move .eh_frame to RODATA
  [PATCH] unwinder: fully support linker generated .eh_frame_hdr section
  [PATCH] x86-64: don't use set_irq_regs()
  [PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
  [PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
  [PATCH] i386: replace kmalloc+memset with kzalloc
  [PATCH] x86-64: remove remaining pc98 code
  [PATCH] x86-64: remove unused variable
  [PATCH] x86-64: Fix constraints in atomic_add_return()
  [PATCH] x86-64: fix asm constraints in i386 atomic_add_return
  [PATCH] x86-64: Correct documentation for bzImage protocol v2.05
  [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
  [PATCH] x86-64: Fix numaq build error
  [PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
  [PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
  [PATCH] x86-64: Clarify error message in GART code
  [PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
  [PATCH] x86-64: Remove unwind stack pointer alignment forcing again
  ...

Fixed conflict in include/linux/uaccess.h manually

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parents 6cf24f03 64a26a73

Documentation/i386/boot.txt

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
		     ----------------------------



		    H. Peter Anvin <hpa@zytor.com>

			Last update 2005-09-02

			Last update 2006-11-17



On the i386 platform, the Linux kernel uses a rather complicated boot

convention.  This has evolved partially due to historical aspects, as
@@ -35,6 +35,8 @@ Protocol 2.03: (Kernel 2.4.18-pre1) Explicitly makes the highest possible 
		initrd address available to the bootloader.



Protocol 2.04:	(Kernel 2.6.14) Extend the syssize field to four bytes.

Protocol 2.05:	(Kernel 2.6.20) Make protected mode kernel relocatable.

		Introduce relocatable_kernel and kernel_alignment fields.





**** MEMORY LAYOUT
@@ -129,6 +131,8 @@ Offset Proto Name Meaning 
0226/2	N/A	pad1		Unused

0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line

022C/4	2.03+	initrd_addr_max	Highest legal initrd address

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not



(1) For backwards compatibility, if the setup_sects field contains 0, the

    real value is 4.

Documentation/kernel-parameters.txt

+8 −2
Original line number Diff line number Diff line
@@ -599,8 +599,6 @@ and is between 256 and 4096 characters. It is defined in the file 


	hugepages=	[HW,IA-32,IA-64] Maximal number of HugeTLB pages.



	noirqbalance	[IA-32,SMP,KNL] Disable kernel irq balancing



	i8042.direct	[HW] Put keyboard port into non-translated mode

	i8042.dumbkbd	[HW] Pretend that controller can only read data from

			     keyboard and cannot control its state
@@ -1065,9 +1063,14 @@ and is between 256 and 4096 characters. It is defined in the file 
			in certain environments such as networked servers or

			real-time systems.



	noirqbalance	[IA-32,SMP,KNL] Disable kernel irq balancing



	noirqdebug	[IA-32] Disables the code which attempts to detect and

			disable unhandled interrupt sources.



	no_timer_check	[IA-32,X86_64,APIC] Disables the code which tests for

			broken timer IRQ sources.



	noisapnp	[ISAPNP] Disables ISA PnP code.



	noinitrd	[RAM] Tells the kernel not to load any configured
@@ -1752,6 +1755,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	norandmaps	Don't use address space randomization

			Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space



 	unwind_debug=N 	N > 0 will enable dwarf2 unwinder debugging

			This is useful to get more information why

			you got a "dwarf2 unwinder stuck"



______________________________________________________________________

Documentation/stable_api_nonsense.txt

+0 −3
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ consider the following facts about the Linux kernel: 
      - different structures can contain different fields

      - Some functions may not be implemented at all, (i.e. some locks

	compile away to nothing for non-SMP builds.)

      - Parameter passing of variables from function to function can be

	done in different ways (the CONFIG_REGPARM option controls

	this.)

      - Memory within the kernel can be aligned in different ways,

	depending on the build options.

  - Linux runs on a wide range of different processor architectures.

Documentation/sysctl/kernel.txt

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ show up in /proc/sys/kernel: 
- hotplug

- java-appletviewer           [ binfmt_java, obsolete ]

- java-interpreter            [ binfmt_java, obsolete ]

- kstack_depth_to_print       [ X86 only ]

- l2cr                        [ PPC only ]

- modprobe                    ==> Documentation/kmod.txt

- msgmax
@@ -170,6 +171,13 @@ This flag controls the L2 cache of G3 processor boards. If 


==============================================================



kstack_depth_to_print: (X86 only)



Controls the number of words to print when dumping the raw

kernel stack.



==============================================================



osrelease, ostype & version:



# cat osrelease

Documentation/x86_64/boot-options.txt

+2 −5
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ APICs 
		 apicmaintimer. Useful when your PIT timer is totally

		 broken.



   disable_8254_timer / enable_8254_timer

		 Enable interrupt 0 timer routing over the 8254 in addition to over

	         the IO-APIC. The kernel tries to set a sensible default.



Early Console



   syntax: earlyprintk=vga
@@ -183,7 +179,7 @@ PCI 
IOMMU



 iommu=[size][,noagp][,off][,force][,noforce][,leak][,memaper[=order]][,merge]

         [,forcesac][,fullflush][,nomerge][,noaperture]

         [,forcesac][,fullflush][,nomerge][,noaperture][,calgary]

   size  set size of iommu (in bytes)

   noagp don't initialize the AGP driver and use full aperture.

   off   don't use the IOMMU
@@ -204,6 +200,7 @@ IOMMU 
	    buffering.

   nodac    Forbid DMA >4GB

   panic    Always panic when IOMMU overflows

   calgary  Use the Calgary IOMMU if it is available



  swiotlb=pages[,force]