Commit fa872b34 authored by David Mosberger's avatar David Mosberger

ia64: Fix IA-32 NPTL fixes so things compile again.

parent d25e93e6
...@@ -63,7 +63,7 @@ struct page * ...@@ -63,7 +63,7 @@ struct page *
ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int no_share) ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int no_share)
{ {
# define NUM_SHARED_PAGES (PAGE_SIZE > IA32_PAGE_SIZE ? 1 : 2) # define NUM_SHARED_PAGES (PAGE_SIZE > IA32_PAGE_SIZE ? 1 : 2)
struct page *pg = ia32_shared_page[NUM_SHARED__PAGES * smp_processor_id() struct page *pg = ia32_shared_page[NUM_SHARED_PAGES * smp_processor_id()
+ (address - vma->vm_start)/PAGE_SIZE]; + (address - vma->vm_start)/PAGE_SIZE];
get_page(pg); get_page(pg);
......
...@@ -457,11 +457,11 @@ void ia64_elf32_init(struct pt_regs *regs); ...@@ -457,11 +457,11 @@ void ia64_elf32_init(struct pt_regs *regs);
static inline void static inline void
load_TLS (struct thread_struct *t, unsigned int cpu) load_TLS (struct thread_struct *t, unsigned int cpu)
{ {
extern struct desc_struct *cpu_gdt_table[NR_CPUS]; extern unsigned long *cpu_gdt_table[NR_CPUS];
cpu_gdt_table[cpu][GDT_ENTRY_TLS_MIN + 0] = t->tls_array[0]; memcpy(cpu_gdt_table[cpu] + GDT_ENTRY_TLS_MIN + 0, &t->tls_array[0], sizeof(long));
cpu_gdt_table[cpu][GDT_ENTRY_TLS_MIN + 1] = t->tls_array[1]; memcpy(cpu_gdt_table[cpu] + GDT_ENTRY_TLS_MIN + 1, &t->tls_array[1], sizeof(long));
cpu_gdt_table[cpu][GDT_ENTRY_TLS_MIN + 2] = t->tls_array[2]; memcpy(cpu_gdt_table[cpu] + GDT_ENTRY_TLS_MIN + 2, &t->tls_array[2], sizeof(long));
} }
struct ia32_user_desc { struct ia32_user_desc {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment