Commit d20ead9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 

* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
  x86: delete vsyscall files during make clean
  kbuild: fix typo SRCARCH in find_sources
  x86: fix kernel rebuild due to vsyscall fallout
  .gitignore update for x86 arch
  x86: unify include/asm/debugreg_32/64.h
  x86: unify include/asm/unwind_32/64.h
  x86: unify include/asm/types_32/64.h
  x86: unify include/asm/tlb_32/64.h
  x86: unify include/asm/siginfo_32/64.h
  x86: unify include/asm/bug_32/64.h
  x86: unify include/asm/mman_32/64.h
  x86: unify include/asm/agp_32/64.h
  x86: unify include/asm/kdebug_32/64.h
  x86: unify include/asm/ioctls_32/64.h
  x86: unify include/asm/floppy_32/64.h
  x86: apply missing DMA/OOM prevention to floppy_32.h
  x86: unify include/asm/cache_32/64.h
  x86: unify include/asm/cache_32/64.h
  x86: unify include/asm/dmi_32/64.h
  x86: unify include/asm/delay_32/64.h
  ...
parents c56ec763 88e4d250

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ vmlinux* 
!vmlinux.lds.S

System.map

Module.symvers

!.gitignore



#

# Generated include files

Documentation/filesystems/proc.txt

+29 −1
Original line number Diff line number Diff line
@@ -347,7 +347,35 @@ connects the CPUs in a SMP system. This means that an error has been detected, 
the IO-APIC automatically retry the transmission, so it should not be a big

problem, but you should read the SMP-FAQ.



In this context it could be interesting to note the new irq directory in 2.4.

In 2.6.2* /proc/interrupts was expanded again.  This time the goal was for

/proc/interrupts to display every IRQ vector in use by the system, not

just those considered 'most important'.  The new vectors are:



  THR -- interrupt raised when a machine check threshold counter

  (typically counting ECC corrected errors of memory or cache) exceeds

  a configurable threshold.  Only available on some systems.



  TRM -- a thermal event interrupt occurs when a temperature threshold

  has been exceeded for the CPU.  This interrupt may also be generated

  when the temperature drops back to normal.



  SPU -- a spurious interrupt is some interrupt that was raised then lowered

  by some IO device before it could be fully processed by the APIC.  Hence

  the APIC sees the interrupt but does not know what device it came from.

  For this case the APIC will generate the interrupt with a IRQ vector

  of 0xff. This might also be generated by chipset bugs.



  RES, CAL, TLB -- rescheduling, call and TLB flush interrupts are

  sent from one CPU to another per the needs of the OS.  Typically,

  their statistics are used by kernel developers and interested users to

  determine the occurance of interrupt of the given type.



The above IRQ vectors are displayed only when relevent.  For example,

the threshold vector does not exist on x86_64 platforms.  Others are

suppressed when the system is a uniprocessor.  As of this writing, only

i386 and x86_64 platforms support the new IRQ vector displays.



Of some interest is the introduction of the /proc/irq directory to 2.4.

It could be used to set IRQ to CPU affinity, this means that you can "hook" an

IRQ to only one CPU, or to exclude a CPU of handling IRQs. The contents of the

irq subdir is one subdir for each IRQ, and one file; prof_cpu_mask

Documentation/kernel-parameters.txt

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


	mce		[X86-32] Machine Check Exception



	mce=option	[X86-64] See Documentation/x86_64/boot-options.txt



	md=		[HW] RAID subsystems devices and level

			See Documentation/md.txt.

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -1325,8 +1325,8 @@ ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH) 
endif



define find-sources

        ( for ARCH in $(ALLSOURCE_ARCHS) ; do \

	       find $(__srctree)arch/$${SRCARCH} $(RCS_FIND_IGNORE) \

        ( for arch in $(ALLSOURCE_ARCHS) ; do \

	       find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \

	            -name $1 -print; \

	  done ; \

	  find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
@@ -1334,8 +1334,8 @@ define find-sources 
	  find $(__srctree)include $(RCS_FIND_IGNORE) \

	       \( -name config -o -name 'asm-*' \) -prune \

	       -o -name $1 -print; \

	  for ARCH in $(ALLINCLUDE_ARCHS) ; do \

	       find $(__srctree)include/asm-$${SRCARCH} $(RCS_FIND_IGNORE) \

	  for arch in $(ALLINCLUDE_ARCHS) ; do \

	       find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \

	            -name $1 -print; \

	  done ; \

	  find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \

arch/i386/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
boot

CRA Git | Maintained and supported by SUSTech CRA and CCSE