mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Auto merge with /home/aegl/GIT/linus
This commit is contained in:
commit
99ad25a313
591 changed files with 40845 additions and 34129 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue