lkml.org 
[lkml]   [2004]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [BKPATCH] ACPI for 2.6
Date
On Friday, August 13, 2004 11:55 pm, Len Brown wrote:
> Hi Linus, please do a
>
> bk pull bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.8
>
> Key fixes for suspend/resume, a couple of common
> boot failures, and misc. random fixes.

You'll need this fix for ia64 though. Linus, please apply.

Define acpi_noirq on ia64 since it's used now in pci_link.c. All ia64
machines use ACPI, so we can just define it to 0 like we do for acpi_disabled
and acpi_pci_disabled.

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>

Thanks,
Jesse
diff -Napur -X /home/jbarnes/dontdiff linux-2.6.8-rc4.orig/include/asm-ia64/acpi.h linux-2.6.8-rc4/include/asm-ia64/acpi.h
--- linux-2.6.8-rc4.orig/include/asm-ia64/acpi.h 2004-08-10 09:01:34.000000000 -0700
+++ linux-2.6.8-rc4/include/asm-ia64/acpi.h 2004-08-10 09:26:39.000000000 -0700
@@ -89,6 +89,7 @@ ia64_acpi_release_global_lock (unsigned
((Acq) = ia64_acpi_release_global_lock((unsigned int *) GLptr))

#define acpi_disabled 0 /* ACPI always enabled on IA64 */
+#define acpi_noirq 0 /* ACPI always enabled on IA64 */
#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
#define acpi_strict 1 /* no ACPI spec workarounds on IA64 */
static inline void disable_acpi(void) { }
\
 
 \ /
  Last update: 2005-03-22 14:05    [W:0.067 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site