[prev in list] [next in list] [prev in thread] [next in thread] 

List:       acpi4linux
Subject:    Re: [Acpi] Patch for ACPI modules
From:       Stephan Kulow <coolo () caldera ! de>
Date:       2001-10-17 11:41:30
[Download RAW message or body]

On Wednesday 17 October 2001 13:32, Stephan Kulow wrote:

> I tried to compile the complete ACPI support as module and would like
> to post my resulting patch for discussion. Feel free to critize, it's my
Dumbdidum - no comment please :)

Greetings, Stephan
["patch" (text/x-diff)]

diff -ru linux-2.4.10.acpi/arch/i386/config.in linux-2.4.10/arch/i386/config.in
--- linux-2.4.10.acpi/arch/i386/config.in	Thu Oct 11 23:36:18 2001
+++ linux-2.4.10/arch/i386/config.in	Thu Oct 11 23:57:13 2001
@@ -247,7 +247,7 @@
 bool 'Power Management support' CONFIG_PM
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   dep_bool '  ACPI support' CONFIG_ACPI $CONFIG_PM
+   dep_tristate '  ACPI support' CONFIG_ACPI $CONFIG_PM
    
    if [ "$CONFIG_ACPI" != "n" ]; then
       source drivers/acpi/Config.in
diff -ru linux-2.4.10.acpi/arch/i386/kernel/Makefile linux-2.4.10/arch/i386/kernel/Makefile
--- linux-2.4.10.acpi/arch/i386/kernel/Makefile	Thu Oct 11 23:36:19 2001
+++ linux-2.4.10/arch/i386/kernel/Makefile	Fri Oct 12 16:59:31 2001
@@ -30,16 +30,23 @@
 endif
 endif
 
+list-multi	:=		acpi_mod.o
+acpi_mod-objs 	:=		acpi.o acpi_wakeup.o
+
 obj-$(CONFIG_MCA)		+= mca.o
 obj-$(CONFIG_MTRR)		+= mtrr.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_APM)		+= apm.o
-obj-$(CONFIG_ACPI)		+= acpi.o acpi_wakeup.o
+obj-$(CONFIG_ACPI)		+= acpi_mod.o
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 
 include $(TOPDIR)/Rules.make
+
+acpi_mod.o: $(acpi_mod-objs)
+	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(acpi_mod-objs)
+
diff -ru linux-2.4.10.acpi/arch/i386/kernel/i386_ksyms.c linux-2.4.10/arch/i386/kernel/i386_ksyms.c
--- linux-2.4.10.acpi/arch/i386/kernel/i386_ksyms.c	Thu Oct 11 23:36:19 2001
+++ linux-2.4.10/arch/i386/kernel/i386_ksyms.c	Tue Oct 16 21:35:14 2001
@@ -175,3 +175,12 @@
 EXPORT_SYMBOL(is_sony_vaio_laptop);
 #endif
 
+#ifdef CONFIG_PM
+EXPORT_SYMBOL(irq_save_state);
+EXPORT_SYMBOL(irq_restore_state);
+extern int cpu_save_state(void);
+extern void cpu_restore_state(void);
+EXPORT_SYMBOL(cpu_save_state);
+EXPORT_SYMBOL(cpu_restore_state);
+#endif
+
diff -ru linux-2.4.10.acpi/drivers/acpi/Config.in linux-2.4.10/drivers/acpi/Config.in
--- linux-2.4.10.acpi/drivers/acpi/Config.in	Thu Oct 11 23:36:14 2001
+++ linux-2.4.10/drivers/acpi/Config.in	Tue Oct 16 21:02:20 2001
@@ -4,8 +4,8 @@
 #mainmenu_option next_comment
 #comment 'ACPI Configuration'
 
-dep_bool     '    ACPI Debug Statements' CONFIG_ACPI_DEBUG $CONFIG_ACPI
-dep_tristate '    ACPI Bus Manager' CONFIG_ACPI_BUSMGR $CONFIG_ACPI
+bool         '    ACPI Debug Statements' CONFIG_ACPI_DEBUG 
+tristate     '    ACPI Bus Manager' CONFIG_ACPI_BUSMGR 
 
 dep_tristate '      System' CONFIG_ACPI_SYS $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
 dep_tristate '      Processor' CONFIG_ACPI_CPU $CONFIG_ACPI_BUSMGR $CONFIG_ACPI
diff -ru linux-2.4.10.acpi/drivers/acpi/Makefile linux-2.4.10/drivers/acpi/Makefile
--- linux-2.4.10.acpi/drivers/acpi/Makefile	Thu Oct 11 23:36:09 2001
+++ linux-2.4.10/drivers/acpi/Makefile	Tue Oct 16 21:23:19 2001
@@ -2,9 +2,9 @@
 # Makefile for the Linux ACPI interpreter
 # 
 
-O_TARGET := acpi.o
+O_TARGET := dummy.o
 
-export-objs := acpi_ksyms.o
+export-objs := acpi_ksyms.o 
 
 export ACPI_CFLAGS
 
@@ -33,13 +33,17 @@
 
 mod-subdirs  := ospm
 
-subdir-$(CONFIG_ACPI) 		+= $(acpi-subdirs)
+obj-$(CONFIG_ACPI)		+= acpi_core.o
 subdir-$(CONFIG_ACPI_BUSMGR)	+= ospm
 
-obj-$(CONFIG_ACPI)	+= driver.o os.o acpi_ksyms.o
-obj-$(CONFIG_ACPI)	+= $(foreach dir,$(acpi-subdirs),$(dir)/$(dir).o) 
+list-multi                     = acpi_core.o
+acpi-objs                      = driver.os os.o acpi_ksyms.o
+
+acpi_core-objs += driver.o os.o acpi_ksyms.o
+acpi_core-objs += $(foreach dir,$(acpi-subdirs),$(patsubst %.c, %.o, $(wildcard $(dir)/*.c)))
+
 ifdef CONFIG_ACPI_KERNEL_CONFIG
-   obj-$(CONFIG_ACPI) 	+= acpiconf.o osconf.o
+   acpi_core-objs	+= acpiconf.o osconf.o
 endif
 
 ifeq ($(CONFIG_ACPI_BUSMGR),y)
@@ -51,4 +55,8 @@
 #	obj-m	+= kdb/kdbm_acpi.o
 #endif
 
+acpi_core.o: $(acpi_core-objs)
+	$(LD) -r -o $@ $(acpi_core-objs)
+
 include $(TOPDIR)/Rules.make
+
diff -ru linux-2.4.10.acpi/drivers/char/serial.c linux-2.4.10/drivers/char/serial.c
--- linux-2.4.10.acpi/drivers/char/serial.c	Thu Oct 11 23:35:37 2001
+++ linux-2.4.10/drivers/char/serial.c	Fri Oct 12 00:06:53 2001
@@ -6156,6 +6156,8 @@
 	serial_console_write(NULL, "serial reenabled\n", strlen("serial reenabled\n"));
 }
 
+EXPORT_SYMBOL(serial_reenable_device);
+
 #endif
 
 /*
diff -ru linux-2.4.10.acpi/mm/Makefile linux-2.4.10/mm/Makefile
--- linux-2.4.10.acpi/mm/Makefile	Thu Oct 11 23:35:09 2001
+++ linux-2.4.10/mm/Makefile	Tue Oct 16 21:39:24 2001
@@ -9,7 +9,7 @@
 
 O_TARGET := mm.o
 
-export-objs := shmem.o
+export-objs := shmem.o bootmem.o
 
 obj-y	 := memory.o mmap.o filemap.o mprotect.o mlock.o mremap.o \
 	    vmalloc.o slab.o bootmem.o swap.o vmscan.o page_io.o \
diff -ru linux-2.4.10.acpi/mm/bootmem.c linux-2.4.10/mm/bootmem.c
--- linux-2.4.10.acpi/mm/bootmem.c	Thu Oct 11 23:35:09 2001
+++ linux-2.4.10/mm/bootmem.c	Tue Oct 16 21:41:00 2001
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/module.h>
 #include <linux/mmzone.h>
 #include <asm/dma.h>
 
@@ -349,3 +350,4 @@
 	return NULL;
 }
 
+EXPORT_SYMBOL(__alloc_bootmem);

_______________________________________________
acpi maillist  -  acpi@phobos.fs.tum.de
https://phobos.fs.tum.de/mailman/listinfo/acpi


[prev in list] [next in list] [prev in thread] [next in thread]