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

Merge branch 'sched-core-for-linus' of... 

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (29 commits)
  sched: Export account_system_vtime()
  sched: Call tick_check_idle before __irq_enter
  sched: Remove irq time from available CPU power
  sched: Do not account irq time to current task
  x86: Add IRQ_TIME_ACCOUNTING
  sched: Add IRQ_TIME_ACCOUNTING, finer accounting of irq time
  sched: Add a PF flag for ksoftirqd identification
  sched: Consolidate account_system_vtime extern declaration
  sched: Fix softirq time accounting
  sched: Drop group_capacity to 1 only if local group has extra capacity
  sched: Force balancing on newidle balance if local group has capacity
  sched: Set group_imb only a task can be pulled from the busiest cpu
  sched: Do not consider SCHED_IDLE tasks to be cache hot
  sched: Drop all load weight manipulation for RT tasks
  sched: Create special class for stop/migrate work
  sched: Unindent labels
  sched: Comment updates: fix default latency and granularity numbers
  tracing/sched: Add sched_pi_setprio tracepoint
  sched: Give CPU bound RT tasks preference
  sched: Try not to migrate higher priority RT tasks
  ...
parents 5d70f79b b7dadc38

Documentation/cputopology.txt

+20 −3
Original line number Diff line number Diff line
@@ -14,25 +14,39 @@ to /proc/cpuinfo. 
	identifier (rather than the kernel's).  The actual value is

	architecture and platform dependent.



3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:

3) /sys/devices/system/cpu/cpuX/topology/book_id:



	the book ID of cpuX. Typically it is the hardware platform's

	identifier (rather than the kernel's).	The actual value is

	architecture and platform dependent.



4) /sys/devices/system/cpu/cpuX/topology/thread_siblings:



	internel kernel map of cpuX's hardware threads within the same

	core as cpuX



4) /sys/devices/system/cpu/cpuX/topology/core_siblings:

5) /sys/devices/system/cpu/cpuX/topology/core_siblings:



	internal kernel map of cpuX's hardware threads within the same

	physical_package_id.



6) /sys/devices/system/cpu/cpuX/topology/book_siblings:



	internal kernel map of cpuX's hardware threads within the same

	book_id.



To implement it in an architecture-neutral way, a new source file,

drivers/base/topology.c, is to export the 4 attributes.

drivers/base/topology.c, is to export the 4 or 6 attributes. The two book

related sysfs files will only be created if CONFIG_SCHED_BOOK is selected.



For an architecture to support this feature, it must define some of

these macros in include/asm-XXX/topology.h:

#define topology_physical_package_id(cpu)

#define topology_core_id(cpu)

#define topology_book_id(cpu)

#define topology_thread_cpumask(cpu)

#define topology_core_cpumask(cpu)

#define topology_book_cpumask(cpu)



The type of **_id is int.

The type of siblings is (const) struct cpumask *.
@@ -45,6 +59,9 @@ not defined by include/asm-XXX/topology.h: 
3) thread_siblings: just the given CPU

4) core_siblings: just the given CPU



For architectures that don't support books (CONFIG_SCHED_BOOK) there are no

default definitions for topology_book_id() and topology_book_cpumask().



Additionally, CPU topology information is provided under

/sys/devices/system/cpu and includes these files.  The internal

source for the output is in brackets ("[]").

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -2435,6 +2435,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			disables clocksource verification at runtime.

			Used to enable high-resolution timer mode on older

			hardware, and in virtualized environment.

			[x86] noirqtime: Do not use TSC to do irq accounting.

			Used to run time disable IRQ_TIME_ACCOUNTING on any

			platforms where RDTSC is slow and this accounting

			can add overhead.



	turbografx.map[2|3]=	[HW,JOY]

			TurboGraFX parallel port interface

arch/ia64/include/asm/system.h

+0 −4
Original line number Diff line number Diff line
@@ -272,10 +272,6 @@ void cpu_idle_wait(void); 


void default_idle(void);



#ifdef CONFIG_VIRT_CPU_ACCOUNTING

extern void account_system_vtime(struct task_struct *);

#endif



#endif /* __KERNEL__ */



#endif /* __ASSEMBLY__ */

arch/powerpc/include/asm/system.h

+0 −4
Original line number Diff line number Diff line
@@ -542,10 +542,6 @@ extern void reloc_got2(unsigned long); 


#define PTRRELOC(x)	((typeof(x)) add_reloc_offset((unsigned long)(x)))



#ifdef CONFIG_VIRT_CPU_ACCOUNTING

extern void account_system_vtime(struct task_struct *);

#endif



extern struct dentry *powerpc_debugfs_root;



#endif /* __KERNEL__ */

arch/s390/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -199,6 +199,13 @@ config HOTPLUG_CPU 
	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.



config SCHED_BOOK

	bool "Book scheduler support"

	depends on SMP

	help

	  Book scheduler support improves the CPU scheduler's decision making

	  when dealing with machines that have several books.



config MATHEMU

	bool "IEEE FPU emulation"

	depends on MARCH_G5

CRA Git | Maintained and supported by SUSTech CRA and CCSE