openharmony/kernel_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/kernel_linux synced 2025-01-08 08:52:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] uml: eliminate anonymous union and clean up symlink lossage

Browse Source 
This gives a name to the anonymous union introduced in skas-hold-own-ldt,
allowing to build on a wider range of gccs.

It also removes ldt.h, which somehow became real, and replaces it with a
symlink, and creates ldt-x86_64.h as a copy of ldt-i386.h for now.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2005-11-21 21:32:08 -08:00 committed by Linus Torvalds
parent 39d730ab87
commit e23181deec
4 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/Makefile
View File

@ -17,7 +17,7 @@ core-y += $(ARCH_DIR)/kernel/ \
# Have to precede the include because the included Makefiles reference them. # Have to precede the include because the included Makefiles reference them.
SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \
module.h vm-flags.h elf.h module.h vm-flags.h elf.h ldt.h
SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes

35
arch/um/sys-i386/ldt.c
View File

@ -228,7 +228,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount)
size = LDT_ENTRY_SIZE*LDT_DIRECT_ENTRIES; size = LDT_ENTRY_SIZE*LDT_DIRECT_ENTRIES;
if(size > bytecount) if(size > bytecount)
size = bytecount; size = bytecount;
if(copy_to_user(ptr, ldt->entries, size)) if(copy_to_user(ptr, ldt->u.entries, size))
err = -EFAULT; err = -EFAULT;
bytecount -= size; bytecount -= size;
ptr += size; ptr += size;
@ -239,7 +239,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount)
size = PAGE_SIZE; size = PAGE_SIZE;
if(size > bytecount) if(size > bytecount)
size = bytecount; size = bytecount;
if(copy_to_user(ptr, ldt->pages[i], size)){ if(copy_to_user(ptr, ldt->u.pages[i], size)){
err = -EFAULT; err = -EFAULT;
break; break;
} }
@ -321,10 +321,11 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
i*LDT_ENTRIES_PER_PAGE <= ldt_info.entry_number; i*LDT_ENTRIES_PER_PAGE <= ldt_info.entry_number;
i++){ i++){
if(i == 0) if(i == 0)
memcpy(&entry0, ldt->entries, sizeof(entry0)); memcpy(&entry0, ldt->u.entries,
ldt->pages[i] = (struct ldt_entry *) sizeof(entry0));
__get_free_page(GFP_KERNEL|__GFP_ZERO); ldt->u.pages[i] = (struct ldt_entry *)
if(!ldt->pages[i]){ __get_free_page(GFP_KERNEL|__GFP_ZERO);
if(!ldt->u.pages[i]){
err = -ENOMEM; err = -ENOMEM;
/* Undo the change in host */ /* Undo the change in host */
memset(&ldt_info, 0, sizeof(ldt_info)); memset(&ldt_info, 0, sizeof(ldt_info));
@ -332,8 +333,9 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
goto out_unlock; goto out_unlock;
} }
if(i == 0) { if(i == 0) {
memcpy(ldt->pages[0], &entry0, sizeof(entry0)); memcpy(ldt->u.pages[0], &entry0,
memcpy(ldt->pages[0]+1, ldt->entries+1, sizeof(entry0));
memcpy(ldt->u.pages[0]+1, ldt->u.entries+1,
sizeof(entry0)*(LDT_DIRECT_ENTRIES-1)); sizeof(entry0)*(LDT_DIRECT_ENTRIES-1));
} }
ldt->entry_count = (i + 1) * LDT_ENTRIES_PER_PAGE; ldt->entry_count = (i + 1) * LDT_ENTRIES_PER_PAGE;
@ -343,9 +345,9 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
ldt->entry_count = ldt_info.entry_number + 1; ldt->entry_count = ldt_info.entry_number + 1;
if(ldt->entry_count <= LDT_DIRECT_ENTRIES) if(ldt->entry_count <= LDT_DIRECT_ENTRIES)
ldt_p = ldt->entries + ldt_info.entry_number; ldt_p = ldt->u.entries + ldt_info.entry_number;
else else
ldt_p = ldt->pages[ldt_info.entry_number/LDT_ENTRIES_PER_PAGE] + ldt_p = ldt->u.pages[ldt_info.entry_number/LDT_ENTRIES_PER_PAGE] +
ldt_info.entry_number%LDT_ENTRIES_PER_PAGE; ldt_info.entry_number%LDT_ENTRIES_PER_PAGE;
if(ldt_info.base_addr == 0 && ldt_info.limit == 0 && if(ldt_info.base_addr == 0 && ldt_info.limit == 0 &&
@ -501,8 +503,8 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
*/ */
down(&from_mm->ldt.semaphore); down(&from_mm->ldt.semaphore);
if(from_mm->ldt.entry_count <= LDT_DIRECT_ENTRIES){ if(from_mm->ldt.entry_count <= LDT_DIRECT_ENTRIES){
memcpy(new_mm->ldt.entries, from_mm->ldt.entries, memcpy(new_mm->ldt.u.entries, from_mm->ldt.u.entries,
sizeof(new_mm->ldt.entries)); sizeof(new_mm->ldt.u.entries));
} }
else{ else{
i = from_mm->ldt.entry_count / LDT_ENTRIES_PER_PAGE; i = from_mm->ldt.entry_count / LDT_ENTRIES_PER_PAGE;
@ -512,9 +514,10 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
err = -ENOMEM; err = -ENOMEM;
break; break;
} }
new_mm->ldt.pages[i] = (struct ldt_entry*)page; new_mm->ldt.u.pages[i] =
memcpy(new_mm->ldt.pages[i], (struct ldt_entry *) page;
from_mm->ldt.pages[i], PAGE_SIZE); memcpy(new_mm->ldt.u.pages[i],
from_mm->ldt.u.pages[i], PAGE_SIZE);
} }
} }
new_mm->ldt.entry_count = from_mm->ldt.entry_count; new_mm->ldt.entry_count = from_mm->ldt.entry_count;
@ -532,7 +535,7 @@ void free_ldt(struct mmu_context_skas * mm)
if(!ptrace_ldt && mm->ldt.entry_count > LDT_DIRECT_ENTRIES){ if(!ptrace_ldt && mm->ldt.entry_count > LDT_DIRECT_ENTRIES){
i = mm->ldt.entry_count / LDT_ENTRIES_PER_PAGE; i = mm->ldt.entry_count / LDT_ENTRIES_PER_PAGE;
while(i-- > 0){ while(i-- > 0){
free_page((long )mm->ldt.pages[i]); free_page((long )mm->ldt.u.pages[i]);
} }
} }
mm->ldt.entry_count = 0; mm->ldt.entry_count = 0;

2
include/asm-um/ldt-i386.h
View File

@ -35,7 +35,7 @@ typedef struct uml_ldt {
union { union {
struct ldt_entry * pages[LDT_PAGES_MAX]; struct ldt_entry * pages[LDT_PAGES_MAX];
struct ldt_entry entries[LDT_DIRECT_ENTRIES]; struct ldt_entry entries[LDT_DIRECT_ENTRIES];
}; } u;
} uml_ldt_t; } uml_ldt_t;
/* /*

7
include/asm-um/ldt.h → include/asm-um/ldt-x86_64.h
View File

@ -35,7 +35,7 @@ typedef struct uml_ldt {
union { union {
struct ldt_entry * pages[LDT_PAGES_MAX]; struct ldt_entry * pages[LDT_PAGES_MAX];
struct ldt_entry entries[LDT_DIRECT_ENTRIES]; struct ldt_entry entries[LDT_DIRECT_ENTRIES];
}; } u;
} uml_ldt_t; } uml_ldt_t;
/* /*
@ -67,8 +67,3 @@ typedef struct uml_ldt {
(info)->useable == 0 ) (info)->useable == 0 )
#endif #endif
#ifndef __UM_LDT_H
#define __UM_LDT_H
#include "asm/arch/ldt.h"
#endif