score: remove unused code, add include files in .c

This commit is contained in:
Chen Liqin 2009-08-30 12:26:32 +08:00
parent d27eadc761
commit d8aa899bb2
5 changed files with 17 additions and 21 deletions

View file

@ -1,9 +1,8 @@
#ifndef _ASM_SCORE_ELF_H #ifndef _ASM_SCORE_ELF_H
#define _ASM_SCORE_ELF_H #define _ASM_SCORE_ELF_H
/* ELF register definitions */ #include <linux/ptrace.h>
#define ELF_NGREG 45
#define ELF_NFPREG 33
#define EM_SCORE7 135 #define EM_SCORE7 135
/* Relocation types. */ /* Relocation types. */
@ -30,11 +29,15 @@
#define R_SCORE_IMM30 20 #define R_SCORE_IMM30 20
#define R_SCORE_IMM32 21 #define R_SCORE_IMM32 21
/* ELF register definitions */
typedef unsigned long elf_greg_t; typedef unsigned long elf_greg_t;
#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
typedef elf_greg_t elf_gregset_t[ELF_NGREG]; typedef elf_greg_t elf_gregset_t[ELF_NGREG];
/* Score does not have fp regs. */
typedef double elf_fpreg_t; typedef double elf_fpreg_t;
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; typedef elf_fpreg_t elf_fpregset_t;
#define elf_check_arch(x) ((x)->e_machine == EM_SCORE7) #define elf_check_arch(x) ((x)->e_machine == EM_SCORE7)
@ -57,6 +60,7 @@ do { \
struct task_struct; struct task_struct;
struct pt_regs; struct pt_regs;
#define CORE_DUMP_USE_REGSET
#define USE_ELF_CORE_DUMP #define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE PAGE_SIZE #define ELF_EXEC_PAGESIZE PAGE_SIZE

View file

@ -17,8 +17,6 @@
"nop;" \ "nop;" \
"nop;" \ "nop;" \
"nop;" \ "nop;" \
"ldi r9, 0x1;" \
"and %0, %0, r9;" \
: "=r" (x) \ : "=r" (x) \
: \ : \
: "r8", "r9" \ : "r8", "r9" \

View file

@ -25,14 +25,14 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/ptrace.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/cacheflush.h>
#include <asm/syscalls.h> #include <asm/syscalls.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <asm/cacheflush.h>
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
struct rt_sigframe { struct rt_sigframe {

View file

@ -144,7 +144,8 @@ void free_initrd_mem(unsigned long start, unsigned long end)
void __init_refok free_initmem(void) void __init_refok free_initmem(void)
{ {
free_init_pages("unused kernel memory", free_init_pages("unused kernel memory",
(unsigned long)__init_begin, (unsigned long)__init_end); __pa(&__init_begin),
__pa(&__init_end));
} }
unsigned long pgd_current; unsigned long pgd_current;
@ -156,4 +157,5 @@ unsigned long pgd_current;
* are constants. So we use the variants from asm-offset.h until that gcc * are constants. So we use the variants from asm-offset.h until that gcc
* will officially be retired. * will officially be retired.
*/ */
pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PTE_ORDER);
pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER); pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER);

View file

@ -47,14 +47,6 @@ void pgd_init(unsigned long page)
void __init pagetable_init(void) void __init pagetable_init(void)
{ {
unsigned long vaddr;
pgd_t *pgd_base;
/* Initialize the entire pgd. */ /* Initialize the entire pgd. */
pgd_init((unsigned long)swapper_pg_dir); pgd_init((unsigned long)swapper_pg_dir);
pgd_init((unsigned long) swapper_pg_dir
+ sizeof(pgd_t) * USER_PTRS_PER_PGD);
pgd_base = swapper_pg_dir;
vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
} }