wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-17 10:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compile for SMP and modversions by copying 'magic' stuff

Browse Source 
from top-level makefile


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1489 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark D. Studebaker committed 2002-08-10 16:57:27 +00:00
1 parent 359b15a603
commit 48148eb7ae
3 files changed
+35 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGES
+1
View File
@@ -28,6 +28,7 @@ ask CVS about it:
Program mkpatch: Add Config.in entries for, lm92,
pcf8574, pcf8591, smsc47m1, vt1211;
add dmi_scan
Program p4b_smbus: Fix compile for SMP and MODVERSIONS
Program sensord: Add /usr/local/etc to config file path;
add support for logging loadavg in RRD;
fix down-converting raw labels for RRD;
prog/hotplug/Makefile.p4b
+30 -1
View File
@@ -3,10 +3,39 @@
VERSION=1.40
# The location of linux itself. This is used to find the kernel headers
# and other things.
LINUX=/usr/src/linux
LINUX_HEADERS=$(LINUX)/include
# Uncomment the third line on SMP systems if the magic invocation fails. It
# is a bit complicated because SMP configuration changed around kernel 2.1.130
SMP := $(shell if grep -q '^SMP[[:space:]]*=' $(LINUX)/Makefile || \
grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_SMP[[:space:]]*1' $(LINUX_HEADERS)/linux/autoconf.h ; \
then echo 1; else echo 0; fi)
#SMP := 0
#SMP := 1
# Uncomment the second or third line if the magic invocation fails.
# We need to know whether CONFIG_MODVERSIONS is defined.
MODVER := $(shell if cat $(LINUX_HEADERS)/linux/config.h $(LINUX_HEADERS)/linux/autoconf.h 2>/dev/null | grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_MODVERSIONS[[:space:]]*1'; then echo 1; else echo 0; fi)
#MODVER := 0
#MODVER := 1
MODCPPFLAGS :=
ifeq ($(SMP),1)
MODCPPFLAGS += -D__SMP__
endif
ifeq ($(MODVER),1)
MODCPPFLAGS += -DMODVERSIONS -include $(LINUX_HEADERS)/linux/modversions.h
endif
VER = $(shell uname -r)
INCLUDEDIR= /lib/modules/$(VER)/build/include
CFLAGS= -D__KERNEL__ -DMODULE -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -I$(INCLUDEDIR)
CFLAGS= $(MODCPPFLAGS) -D__KERNEL__ -DMODULE -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -I$(INCLUDEDIR)
OBJS = p4b_smbus.o
prog/hotplug/p4b_smbus.c
+4 -10
View File
@@ -60,12 +60,6 @@
#error ERROR - You must have 'Support for hot-pluggable devices' enabled in your kernel (under 'general setup')!!
#endif
/* Deal with CONFIG_MODVERSIONS */
#ifdef CONFIG_MODVERSIONS
#define MODVERSIONS
#include <linux/modversions.h>
#endif
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
@@ -131,7 +125,7 @@ i801smbus_enable(struct pci_dev *dev){
return -EIO;
}
else
printk("SMBus activated in LPC!\n");
printk("i801smbus: SMBus activated in LPC!\n");
}
return 0;
@@ -230,17 +224,17 @@ int init_module(void)
dev = pci_find_device(0x8086, ICH4, NULL);
if (NULL == dev)
{
printk("INTEL ICH2/4 (82801AB/DB) not found.\n");
printk("i801smbus: INTEL ICH2/4 (82801AB/DB) not found.\n");
return -ENODEV ;
}
else
{
printk("found Intel ICH4 (82801DB).\n");
printk("i801smbus: found Intel ICH4 (82801DB).\n");
}
}
else
{
printk("found Intel ICH2 (82801AB).\n");
printk("i801smbus: found Intel ICH2 (82801AB).\n");
}
/* we need the bus pointer later */