diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 15:41:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 15:41:36 +0100 |
| commit | cbe9ee00cea58d1f77b172fe22a51080e90877f2 (patch) | |
| tree | bef908ddde094287e57fc0a5a3bb3f84fee6a767 /include | |
| parent | x86: entry_64.S: remove whitespace at end of lines (diff) | |
| parent | x86, PEBS/DS: fix code flow in ds_request() (diff) | |
| download | linux-cbe9ee00cea58d1f77b172fe22a51080e90877f2.tar.xz linux-cbe9ee00cea58d1f77b172fe22a51080e90877f2.zip | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/iomap.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/asm-x86/iomap.h b/include/asm-x86/iomap.h deleted file mode 100644 index c1f06289b14b..000000000000 --- a/include/asm-x86/iomap.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright © 2008 Ingo Molnar - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#include <linux/fs.h> -#include <linux/mm.h> -#include <linux/uaccess.h> -#include <asm/cacheflush.h> -#include <asm/pgtable.h> -#include <asm/tlbflush.h> - -void * -iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); - -void -iounmap_atomic(void *kvaddr, enum km_type type); |