linux-libc-headers/trunk/include/asm-um: a.out.h archparam-i386.h
archparam-ppc.h common.lds.S cpufe...
pluto
cvs at pld-linux.org
Fri Nov 4 22:10:16 CET 2005
Author: pluto
Date: Fri Nov 4 22:10:10 2005
New Revision: 6517
Added:
linux-libc-headers/trunk/include/asm-um/cpufeature.h
linux-libc-headers/trunk/include/asm-um/div64.h
linux-libc-headers/trunk/include/asm-um/ldt.h
linux-libc-headers/trunk/include/asm-um/local.h
linux-libc-headers/trunk/include/asm-um/module-generic.h
linux-libc-headers/trunk/include/asm-um/module-i386.h
linux-libc-headers/trunk/include/asm-um/module-x86_64.h
linux-libc-headers/trunk/include/asm-um/pci.h
linux-libc-headers/trunk/include/asm-um/sigcontext-x86_64.h
linux-libc-headers/trunk/include/asm-um/system-x86_64.h
Removed:
linux-libc-headers/trunk/include/asm-um/a.out.h
linux-libc-headers/trunk/include/asm-um/archparam-i386.h
linux-libc-headers/trunk/include/asm-um/archparam-ppc.h
linux-libc-headers/trunk/include/asm-um/common.lds.S
linux-libc-headers/trunk/include/asm-um/dma.h
linux-libc-headers/trunk/include/asm-um/fixmap.h
linux-libc-headers/trunk/include/asm-um/irq_vectors.h
linux-libc-headers/trunk/include/asm-um/mmu.h
linux-libc-headers/trunk/include/asm-um/mmu_context.h
linux-libc-headers/trunk/include/asm-um/page_offset.h
linux-libc-headers/trunk/include/asm-um/pgalloc.h
linux-libc-headers/trunk/include/asm-um/processor-generic.h
linux-libc-headers/trunk/include/asm-um/processor-i386.h
linux-libc-headers/trunk/include/asm-um/processor-ppc.h
linux-libc-headers/trunk/include/asm-um/ptrace-generic.h
linux-libc-headers/trunk/include/asm-um/ptrace-i386.h
linux-libc-headers/trunk/include/asm-um/segment.h
linux-libc-headers/trunk/include/asm-um/suspend.h
linux-libc-headers/trunk/include/asm-um/tlbflush.h
linux-libc-headers/trunk/include/asm-um/unistd.h
Modified:
linux-libc-headers/trunk/include/asm-um/elf-i386.h
linux-libc-headers/trunk/include/asm-um/elf-ppc.h
linux-libc-headers/trunk/include/asm-um/elf-x86_64.h
linux-libc-headers/trunk/include/asm-um/hardirq.h
linux-libc-headers/trunk/include/asm-um/io.h
linux-libc-headers/trunk/include/asm-um/ipc.h
linux-libc-headers/trunk/include/asm-um/system-generic.h
linux-libc-headers/trunk/include/asm-um/timex.h
Log:
- updated to 2.6.14, cleaned up.
Added: linux-libc-headers/trunk/include/asm-um/cpufeature.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/cpufeature.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef __UM_CPUFEATURE_H
+#define __UM_CPUFEATURE_H
+
+#include "asm/arch/cpufeature.h"
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/div64.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/div64.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef _UM_DIV64_H
+#define _UM_DIV64_H
+
+#include "asm/arch/div64.h"
+
+#endif
Modified: linux-libc-headers/trunk/include/asm-um/elf-i386.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/elf-i386.h (original)
+++ linux-libc-headers/trunk/include/asm-um/elf-i386.h Fri Nov 4 22:10:10 2005
@@ -75,95 +75,11 @@
pr_reg[16] = PT_REGS_SS(regs); \
} while(0);
-extern long elf_aux_hwcap;
-#define ELF_HWCAP (elf_aux_hwcap)
-
-extern char * elf_aux_platform;
-#define ELF_PLATFORM (elf_aux_platform)
-
#define SET_PERSONALITY(ex, ibcs2) do ; while(0)
-extern unsigned long vsyscall_ehdr;
-extern unsigned long vsyscall_end;
-extern unsigned long __kernel_vsyscall;
-
-#define VSYSCALL_BASE vsyscall_ehdr
-#define VSYSCALL_END vsyscall_end
-
-/*
- * This is the range that is readable by user mode, and things
- * acting like user mode such as get_user_pages.
- */
-#define FIXADDR_USER_START VSYSCALL_BASE
-#define FIXADDR_USER_END VSYSCALL_END
-
/*
* Architecture-neutral AT_ values in 0-17, leave some room
* for more of them, start the x86-specific ones at 32.
*/
#define AT_SYSINFO 32
#define AT_SYSINFO_EHDR 33
-
-#define ARCH_DLINFO \
-do { \
- if ( vsyscall_ehdr ) { \
- NEW_AUX_ENT(AT_SYSINFO, __kernel_vsyscall); \
- NEW_AUX_ENT(AT_SYSINFO_EHDR, vsyscall_ehdr); \
- } \
-} while (0)
-
-/*
- * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
- * extra segments containing the vsyscall DSO contents. Dumping its
- * contents makes post-mortem fully interpretable later without matching up
- * the same kernel and hardware config to see what PC values meant.
- * Dumping its extra ELF program headers includes all the other information
- * a debugger needs to easily find how the vsyscall DSO was being used.
- */
-#define ELF_CORE_EXTRA_PHDRS \
- (vsyscall_ehdr ? (((struct elfhdr *)vsyscall_ehdr)->e_phnum) : 0 )
-
-#define ELF_CORE_WRITE_EXTRA_PHDRS \
-if ( vsyscall_ehdr ) { \
- const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr; \
- const struct elf_phdr *const phdrp = \
- (const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff); \
- int i; \
- Elf32_Off ofs = 0; \
- for (i = 0; i < ehdrp->e_phnum; ++i) { \
- struct elf_phdr phdr = phdrp[i]; \
- if (phdr.p_type == PT_LOAD) { \
- ofs = phdr.p_offset = offset; \
- offset += phdr.p_filesz; \
- } \
- else \
- phdr.p_offset += ofs; \
- phdr.p_paddr = 0; /* match other core phdrs */ \
- DUMP_WRITE(&phdr, sizeof(phdr)); \
- } \
-}
-#define ELF_CORE_WRITE_EXTRA_DATA \
-if ( vsyscall_ehdr ) { \
- const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr; \
- const struct elf_phdr *const phdrp = \
- (const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff); \
- int i; \
- for (i = 0; i < ehdrp->e_phnum; ++i) { \
- if (phdrp[i].p_type == PT_LOAD) \
- DUMP_WRITE((void *) phdrp[i].p_vaddr, \
- phdrp[i].p_filesz); \
- } \
-}
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
Modified: linux-libc-headers/trunk/include/asm-um/elf-ppc.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/elf-ppc.h (original)
+++ linux-libc-headers/trunk/include/asm-um/elf-ppc.h Fri Nov 4 22:10:10 2005
@@ -1,23 +1,12 @@
#ifndef __UM_ELF_PPC_H
#define __UM_ELF_PPC_H
-#include "linux/config.h"
-
-extern long elf_aux_hwcap;
-#define ELF_HWCAP (elf_aux_hwcap)
-
#define SET_PERSONALITY(ex, ibcs2) do ; while(0)
#define ELF_EXEC_PAGESIZE 4096
#define elf_check_arch(x) (1)
-#ifdef CONFIG_64_BIT
-#define ELF_CLASS ELFCLASS64
-#else
-#define ELF_CLASS ELFCLASS32
-#endif
-
#define USE_ELF_CORE_DUMP
#define R_386_NONE 0
Modified: linux-libc-headers/trunk/include/asm-um/elf-x86_64.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/elf-x86_64.h (original)
+++ linux-libc-headers/trunk/include/asm-um/elf-x86_64.h Fri Nov 4 22:10:10 2005
@@ -64,32 +64,13 @@
PT_REGS_R15(regs) = 0; \
} while (0)
-#ifdef TIF_IA32 /* XXX */
-#error XXX, indeed
- clear_thread_flag(TIF_IA32);
-#endif
-
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
-extern long elf_aux_hwcap;
-#define ELF_HWCAP (elf_aux_hwcap)
-
#define ELF_PLATFORM "x86_64"
#define SET_PERSONALITY(ex, ibcs2) do ; while(0)
#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
Modified: linux-libc-headers/trunk/include/asm-um/hardirq.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/hardirq.h (original)
+++ linux-libc-headers/trunk/include/asm-um/hardirq.h Fri Nov 4 22:10:10 2005
@@ -14,12 +14,4 @@
#include <linux/irq_cpustat.h>
-/* As this would be very strange for UML to get we BUG() after the
- * printk. */
-static inline void ack_bad_irq(unsigned int irq)
-{
- printk(KERN_ERR "unexpected IRQ %02x\n", irq);
- BUG();
-}
-
#endif /* __ASM_UM_HARDIRQ_H */
Modified: linux-libc-headers/trunk/include/asm-um/io.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/io.h (original)
+++ linux-libc-headers/trunk/include/asm-um/io.h Fri Nov 4 22:10:10 2005
@@ -8,29 +8,4 @@
static inline int inb(unsigned long i) { return(0); }
static inline void outb(char c, unsigned long i) { }
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are pretty trivial
- */
-static inline unsigned long virt_to_phys(volatile void * address)
-{
- return __pa((void *) address);
-}
-
-static inline void * phys_to_virt(unsigned long address)
-{
- return __va(address);
-}
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p) __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p) p
-
#endif
Modified: linux-libc-headers/trunk/include/asm-um/ipc.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/ipc.h (original)
+++ linux-libc-headers/trunk/include/asm-um/ipc.h Fri Nov 4 22:10:10 2005
@@ -1,6 +1 @@
-#ifndef __UM_IPC_H
-#define __UM_IPC_H
-
-#include "asm/arch/ipc.h"
-
-#endif
+#include <asm-generic/ipc.h>
Added: linux-libc-headers/trunk/include/asm-um/ldt.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/ldt.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef __UM_LDT_H
+#define __UM_LDT_H
+
+#include "asm/arch/ldt.h"
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/local.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/local.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef __UM_LOCAL_H
+#define __UM_LOCAL_H
+
+#include "asm/arch/local.h"
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/module-generic.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/module-generic.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef __UM_MODULE_GENERIC_H
+#define __UM_MODULE_GENERIC_H
+
+#include "asm/arch/module.h"
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/module-i386.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/module-i386.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,13 @@
+#ifndef __UM_MODULE_I386_H
+#define __UM_MODULE_I386_H
+
+/* UML is simple */
+struct mod_arch_specific
+{
+};
+
+#define Elf_Shdr Elf32_Shdr
+#define Elf_Sym Elf32_Sym
+#define Elf_Ehdr Elf32_Ehdr
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/module-x86_64.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/module-x86_64.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,13 @@
+#ifndef __UM_MODULE_X86_64_H
+#define __UM_MODULE_X86_64_H
+
+/* UML is simple */
+struct mod_arch_specific
+{
+};
+
+#define Elf_Shdr Elf64_Shdr
+#define Elf_Sym Elf64_Sym
+#define Elf_Ehdr Elf64_Ehdr
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/pci.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/pci.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,7 @@
+#ifndef __UM_PCI_H
+#define __UM_PCI_H
+
+#define PCI_DMA_BUS_IS_PHYS (1)
+#define pcibios_scan_all_fns(a, b) 0
+
+#endif
Added: linux-libc-headers/trunk/include/asm-um/sigcontext-x86_64.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/sigcontext-x86_64.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef __UM_SIGCONTEXT_X86_64_H
+#define __UM_SIGCONTEXT_X86_64_H
+
+#include "asm/sigcontext-generic.h"
+
+#endif
Modified: linux-libc-headers/trunk/include/asm-um/system-generic.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/system-generic.h (original)
+++ linux-libc-headers/trunk/include/asm-um/system-generic.h Fri Nov 4 22:10:10 2005
@@ -3,45 +3,4 @@
#include "asm/arch/system.h"
-#undef switch_to
-#undef local_irq_save
-#undef local_irq_restore
-#undef local_irq_disable
-#undef local_irq_enable
-#undef local_save_flags
-#undef local_irq_restore
-#undef local_irq_enable
-#undef local_irq_disable
-#undef local_irq_save
-#undef irqs_disabled
-
-extern void *switch_to(void *prev, void *next, void *last);
-
-extern int get_signals(void);
-extern int set_signals(int enable);
-extern int get_signals(void);
-extern void block_signals(void);
-extern void unblock_signals(void);
-
-#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
- (flags) = get_signals(); } while(0)
-#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
- set_signals(flags); } while(0)
-
-#define local_irq_save(flags) do { local_save_flags(flags); \
- local_irq_disable(); } while(0)
-
-#define local_irq_enable() unblock_signals()
-#define local_irq_disable() block_signals()
-
-#define irqs_disabled() \
-({ \
- unsigned long flags; \
- local_save_flags(flags); \
- (flags == 0); \
-})
-
-extern void *_switch_to(void *prev, void *next, void *last);
-#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)
-
#endif
Added: linux-libc-headers/trunk/include/asm-um/system-x86_64.h
==============================================================================
--- (empty file)
+++ linux-libc-headers/trunk/include/asm-um/system-x86_64.h Fri Nov 4 22:10:10 2005
@@ -0,0 +1,6 @@
+#ifndef __UM_SYSTEM_X86_64_H
+#define __UM_SYSTEM_X86_64_H
+
+#include "asm/system-generic.h"
+
+#endif
Modified: linux-libc-headers/trunk/include/asm-um/timex.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-um/timex.h (original)
+++ linux-libc-headers/trunk/include/asm-um/timex.h Fri Nov 4 22:10:10 2005
@@ -1,10 +1,13 @@
#ifndef __UM_TIMEX_H
#define __UM_TIMEX_H
-#include "sys/time.h"
-
typedef unsigned long cycles_t;
+static inline cycles_t get_cycles (void)
+{
+ return 0;
+}
+
#define CLOCK_TICK_RATE (HZ)
#endif
More information about the pld-cvs-commit
mailing list