diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/asm-ia64 | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
| download | kernel_samsung_tuna-99ad25a313bda566a346b46a6015afa65bc0a02b.zip kernel_samsung_tuna-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.gz kernel_samsung_tuna-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.bz2 | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/acpi.h | 9 | ||||
| -rw-r--r-- | include/asm-ia64/pci.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index 6a26a97..4c06d45 100644 --- a/include/asm-ia64/acpi.h +++ b/include/asm-ia64/acpi.h @@ -98,6 +98,15 @@ const char *acpi_get_sysname (void); int acpi_request_vector (u32 int_type); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); +/* + * Record the cpei override flag and current logical cpu. This is + * useful for CPU removal. + */ +extern unsigned int can_cpei_retarget(void); +extern unsigned int is_cpu_cpei_target(unsigned int cpu); +extern void set_cpei_target_cpu(unsigned int cpu); +extern unsigned int get_cpei_target_cpu(void); + #ifdef CONFIG_ACPI_NUMA /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/ #define MAX_PXM_DOMAINS (256) diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 8b7237c..dba9f22 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h @@ -47,7 +47,7 @@ pcibios_set_master (struct pci_dev *dev) } static inline void -pcibios_penalize_isa_irq (int irq) +pcibios_penalize_isa_irq (int irq, int active) { /* We don't do dynamic PCI IRQ allocation */ } |