Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger: "UML receives this time only cleanups. The most outstanding change is the 'include "foo.h"' do 'include <foo.h>' conversion done by Al Viro. It touches many files, that's why the diffstat is rather big." * 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: typo in UserModeLinux-HOWTO hppfs: fix the return value of get_inode() hostfs: drop vmtruncate um: get rid of pointless include "..." where include <...> will do um: move sysrq.h out of include/shared um/x86: merge 32 and 64 bit variants of ptrace.h um/x86: merge 32 and 64bit variants of checksum.h
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef __UM_DMA_H
|
||||
#define __UM_DMA_H
|
||||
|
||||
#include "asm/io.h"
|
||||
#include <asm/io.h>
|
||||
|
||||
extern unsigned long uml_physmem;
|
||||
|
||||
|
@@ -6,7 +6,7 @@
|
||||
#ifndef __ARCH_UM_MMU_H
|
||||
#define __ARCH_UM_MMU_H
|
||||
|
||||
#include "mm_id.h"
|
||||
#include <mm_id.h>
|
||||
#include <asm/mm_context.h>
|
||||
|
||||
typedef struct mm_context {
|
||||
|
@@ -99,7 +99,7 @@ extern unsigned long uml_physmem;
|
||||
|
||||
#define __va_space (8*1024*1024)
|
||||
|
||||
#include "mem.h"
|
||||
#include <mem.h>
|
||||
|
||||
/* Cast to unsigned long before casting to void * to avoid a warning from
|
||||
* mmap_kmem about cutting a long long down to a void *. Not sure that
|
||||
|
@@ -23,9 +23,9 @@
|
||||
pte_present gives true */
|
||||
|
||||
#ifdef CONFIG_3_LEVEL_PGTABLES
|
||||
#include "asm/pgtable-3level.h"
|
||||
#include <asm/pgtable-3level.h>
|
||||
#else
|
||||
#include "asm/pgtable-2level.h"
|
||||
#include <asm/pgtable-2level.h>
|
||||
#endif
|
||||
|
||||
extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
|
||||
|
@@ -10,9 +10,9 @@ struct pt_regs;
|
||||
|
||||
struct task_struct;
|
||||
|
||||
#include "asm/ptrace.h"
|
||||
#include "registers.h"
|
||||
#include "sysdep/archsetjmp.h"
|
||||
#include <asm/ptrace.h>
|
||||
#include <registers.h>
|
||||
#include <sysdep/archsetjmp.h>
|
||||
|
||||
#include <linux/prefetch.h>
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <asm/ptrace-abi.h>
|
||||
#include "sysdep/ptrace.h"
|
||||
#include <sysdep/ptrace.h>
|
||||
|
||||
struct pt_regs {
|
||||
struct uml_pt_regs regs;
|
||||
|
@@ -3,9 +3,9 @@
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
|
||||
#include "linux/bitops.h"
|
||||
#include "asm/current.h"
|
||||
#include "linux/cpumask.h"
|
||||
#include <linux/bitops.h>
|
||||
#include <asm/current.h>
|
||||
#include <linux/cpumask.h>
|
||||
|
||||
#define raw_smp_processor_id() (current_thread->cpu)
|
||||
|
||||
|
7
arch/um/include/asm/sysrq.h
Normal file
7
arch/um/include/asm/sysrq.h
Normal file
@@ -0,0 +1,7 @@
|
||||
#ifndef __UM_SYSRQ_H
|
||||
#define __UM_SYSRQ_H
|
||||
|
||||
struct task_struct;
|
||||
extern void show_trace(struct task_struct* task, unsigned long *stack);
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user