| .. | .. | 
|---|
| 13 | 13 |   * On x86_64, %gs is shared by percpu area and stack canary.  All | 
|---|
| 14 | 14 |   * percpu symbols are zero based and %gs points to the base of percpu | 
|---|
| 15 | 15 |   * area.  The first occupant of the percpu area is always | 
|---|
| 16 |  | - * irq_stack_union which contains stack_canary at offset 40.  Userland  | 
|---|
 | 16 | + * fixed_percpu_data which contains stack_canary at offset 40.  Userland  | 
|---|
| 17 | 17 |   * %gs is always saved and restored on kernel entry and exit using | 
|---|
| 18 | 18 |   * swapgs, so stack protector doesn't add any complexity there. | 
|---|
| 19 | 19 |   * | 
|---|
| .. | .. | 
|---|
| 69 | 69 |  	u64 tsc; | 
|---|
| 70 | 70 |   | 
|---|
| 71 | 71 |  #ifdef CONFIG_X86_64 | 
|---|
| 72 |  | -	BUILD_BUG_ON(offsetof(union irq_stack_union, stack_canary) != 40);  | 
|---|
 | 72 | +	BUILD_BUG_ON(offsetof(struct fixed_percpu_data, stack_canary) != 40);  | 
|---|
| 73 | 73 |  #endif | 
|---|
| 74 | 74 |  	/* | 
|---|
| 75 | 75 |  	 * We both use the random pool and the current TSC as a source | 
|---|
| .. | .. | 
|---|
| 84 | 84 |   | 
|---|
| 85 | 85 |  	current->stack_canary = canary; | 
|---|
| 86 | 86 |  #ifdef CONFIG_X86_64 | 
|---|
| 87 |  | -	this_cpu_write(irq_stack_union.stack_canary, canary);  | 
|---|
 | 87 | +	this_cpu_write(fixed_percpu_data.stack_canary, canary);  | 
|---|
| 88 | 88 |  #else | 
|---|
| 89 | 89 |  	this_cpu_write(stack_canary.canary, canary); | 
|---|
 | 90 | +#endif  | 
|---|
 | 91 | +}  | 
|---|
 | 92 | +  | 
|---|
 | 93 | +static inline void cpu_init_stack_canary(int cpu, struct task_struct *idle)  | 
|---|
 | 94 | +{  | 
|---|
 | 95 | +#ifdef CONFIG_X86_64  | 
|---|
 | 96 | +	per_cpu(fixed_percpu_data.stack_canary, cpu) = idle->stack_canary;  | 
|---|
 | 97 | +#else  | 
|---|
 | 98 | +	per_cpu(stack_canary.canary, cpu) = idle->stack_canary;  | 
|---|
| 90 | 99 |  #endif | 
|---|
| 91 | 100 |  } | 
|---|
| 92 | 101 |   | 
|---|
| .. | .. | 
|---|
| 119 | 128 |  static inline void setup_stack_canary_segment(int cpu) | 
|---|
| 120 | 129 |  { } | 
|---|
| 121 | 130 |   | 
|---|
 | 131 | +static inline void cpu_init_stack_canary(int cpu, struct task_struct *idle)  | 
|---|
 | 132 | +{ }  | 
|---|
 | 133 | +  | 
|---|
| 122 | 134 |  static inline void load_stack_canary_segment(void) | 
|---|
| 123 | 135 |  { | 
|---|
| 124 | 136 |  #ifdef CONFIG_X86_32 | 
|---|