litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2010-07-04 23:21:39 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2010-07-04 23:21:39 -0400
commit	71665963af194f50402a2cb1339828caff4ee9ee (patch)
tree	f5e39b7cd098419a7bfeee911e75ec19bb0abd63 /tools/perf/scripts/python
parent	3f7d7b4bded5bd2cc9934a2ed9a7ce68feb636b0 (diff)
parent	446a5a8b1eb91a6990e5c8fe29f14e7a95b69132 (diff)

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6205/1: perf: ensure counter delta is treated as unsigned ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220 ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220 ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section ARM: 6192/1: VExpress: Align the machine_desc.phys_io to 1MB section ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance workaround ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI [ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA [ARM] pxa/mioa701: fix camera regression [ARM] pxa/z2: fix flash layout to final version [ARM] pxa/z2: fix missing include in battery driver [ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h

Diffstat (limited to 'tools/perf/scripts/python')

0 files changed, 0 insertions, 0 deletions

/* * Derived from include/asm-powerpc/iommu.h * * Copyright IBM Corporation, 2006-2007 * * Author: Jon Mason <jdmason@us.ibm.com> * Author: Muli Ben-Yehuda <muli@il.ibm.com> * * 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 */ #ifndef _ASM_X86_64_CALGARY_H #define _ASM_X86_64_CALGARY_H #include <linux/spinlock.h> #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/timer.h> #include <asm/types.h> struct iommu_table { struct cal_chipset_ops *chip_ops; /* chipset specific funcs */ unsigned long it_base; /* mapped address of tce table */ unsigned long it_hint; /* Hint for next alloc */ unsigned long *it_map; /* A simple allocation bitmap for now */ void __iomem *bbar; /* Bridge BAR */ u64 tar_val; /* Table Address Register */ struct timer_list watchdog_timer; spinlock_t it_lock; /* Protects it_map */ unsigned int it_size; /* Size of iommu table in entries */ unsigned char it_busno; /* Bus number this table belongs to */ }; struct cal_chipset_ops { void (*handle_quirks)(struct iommu_table *tbl, struct pci_dev *dev); void (*tce_cache_blast)(struct iommu_table *tbl); void (*dump_error_regs)(struct iommu_table *tbl); }; #define TCE_TABLE_SIZE_UNSPECIFIED ~0 #define TCE_TABLE_SIZE_64K 0 #define TCE_TABLE_SIZE_128K 1 #define TCE_TABLE_SIZE_256K 2 #define TCE_TABLE_SIZE_512K 3 #define TCE_TABLE_SIZE_1M 4 #define TCE_TABLE_SIZE_2M 5 #define TCE_TABLE_SIZE_4M 6 #define TCE_TABLE_SIZE_8M 7 extern int use_calgary; #ifdef CONFIG_CALGARY_IOMMU extern int calgary_iommu_init(void); extern void detect_calgary(void); #else static inline int calgary_iommu_init(void) { return 1; } static inline void detect_calgary(void) { return; } #endif #endif /* _ASM_X86_64_CALGARY_H */


context:
space:
mode: