Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250957
b: refs/heads/master
c: 818b667
h: refs/heads/master
i:
  250955: 9e5d9dd
v: v3
  • Loading branch information
Stephen Boyd authored and Linus Torvalds committed May 25, 2011
1 parent 0a59368 commit 156f0e6
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21b7d815b2cc380929181e1a4a7129e8b569e574
refs/heads/master: 818b667ba57f68bf1e7240fa441dda0b11e6b944
2 changes: 0 additions & 2 deletions trunk/arch/alpha/include/asm/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ struct cpuinfo_alpha {

extern struct cpuinfo_alpha cpu_data[NR_CPUS];

#define PROC_CHANGE_PENALTY 20

#define hard_smp_processor_id() __hard_smp_processor_id()
#define raw_smp_processor_id() (current_thread_info()->cpu)

Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/arm/include/asm/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@

#define raw_smp_processor_id() (current_thread_info()->cpu)

/*
* at the moment, there's not a big penalty for changing CPUs
* (the >big< penalty is running SMP in the first place)
*/
#define PROC_CHANGE_PENALTY 15

struct seq_file;

/*
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/m32r/include/asm/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);

#define NO_PROC_ID (0xff) /* No processor magic marker */

#define PROC_CHANGE_PENALTY (15) /* Schedule penalty */

/*
* M32R-mp IPI
*/
Expand Down
9 changes: 0 additions & 9 deletions trunk/arch/parisc/include/asm/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);

#endif /* !ASSEMBLY */

/*
* This magic constant controls our willingness to transfer
* a process across CPUs. Such a transfer incurs cache and tlb
* misses. The current value is inherited from i386. Still needs
* to be tuned for parisc.
*/

#define PROC_CHANGE_PENALTY 15 /* Schedule penalty */

#define raw_smp_processor_id() (current_thread_info()->cpu)

#else /* CONFIG_SMP */
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/um/include/asm/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

#define cpu_logical_map(n) (n)
#define cpu_number_map(n) (n)
#define PROC_CHANGE_PENALTY 15 /* Pick a number, any number */
extern int hard_smp_processor_id(void);
#define NO_PROC_ID -1

Expand Down

0 comments on commit 156f0e6

Please sign in to comment.