summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--driver/Makefile2
-rw-r--r--driver/base.h10
-rw-r--r--pcitool/CMakeLists.txt2
3 files changed, 7 insertions, 7 deletions
diff --git a/driver/Makefile b/driver/Makefile
index e353228..3a242dd 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -3,7 +3,7 @@ obj-m := pciDriver.o
pciDriver-objs := base.o int.o umem.o kmem.o sysfs.o ioctl.o
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-INSTALLDIR ?= /lib/modules/$(shell uname -r)/extra
+INSTALLDIR ?= /lib/modules/$(shell uname -r)/kernel/extra
PWD := $(shell pwd)
EXTRA_CFLAGS += -I$(M)/..
diff --git a/driver/base.h b/driver/base.h
index 9384e2d..b976d3f 100644
--- a/driver/base.h
+++ b/driver/base.h
@@ -68,14 +68,14 @@ static dev_t pcidriver_devt;
static atomic_t pcidriver_deviceCount;
/* Sysfs attributes */
-static DEVICE_ATTR(mmap_mode, (S_IRUGO | S_IWUGO), pcidriver_show_mmap_mode, pcidriver_store_mmap_mode);
-static DEVICE_ATTR(mmap_area, (S_IRUGO | S_IWUGO), pcidriver_show_mmap_area, pcidriver_store_mmap_area);
+static DEVICE_ATTR(mmap_mode, 0664, pcidriver_show_mmap_mode, pcidriver_store_mmap_mode);
+static DEVICE_ATTR(mmap_area, 0664, pcidriver_show_mmap_area, pcidriver_store_mmap_area);
static DEVICE_ATTR(kmem_count, S_IRUGO, pcidriver_show_kmem_count, NULL);
static DEVICE_ATTR(kbuffers, S_IRUGO, pcidriver_show_kbuffers, NULL);
-static DEVICE_ATTR(kmem_alloc, S_IWUGO, NULL, pcidriver_store_kmem_alloc);
-static DEVICE_ATTR(kmem_free, S_IWUGO, NULL, pcidriver_store_kmem_free);
+static DEVICE_ATTR(kmem_alloc, 0220, NULL, pcidriver_store_kmem_alloc);
+static DEVICE_ATTR(kmem_free, 0220, NULL, pcidriver_store_kmem_free);
static DEVICE_ATTR(umappings, S_IRUGO, pcidriver_show_umappings, NULL);
-static DEVICE_ATTR(umem_unmap, S_IWUGO, NULL, pcidriver_store_umem_unmap);
+static DEVICE_ATTR(umem_unmap, 0220, NULL, pcidriver_store_umem_unmap);
#ifdef ENABLE_IRQ
static DEVICE_ATTR(irq_count, S_IRUGO, pcidriver_show_irq_count, NULL);
diff --git a/pcitool/CMakeLists.txt b/pcitool/CMakeLists.txt
index fc88de6..4aea142 100644
--- a/pcitool/CMakeLists.txt
+++ b/pcitool/CMakeLists.txt
@@ -12,7 +12,7 @@ link_directories(
if (NOT DISABLE_PCITOOL)
add_executable(pci cli.c sysinfo.c formaters.c)
set(HEADERS ${HEADERS} sysinfo.h formaters.h)
- add_dependencies(pci pcitool)
+ add_dependencies(pci pcilib)
target_link_libraries(pci pcilib ${FASTWRITER_LIBRARIES})
set_target_properties(pci PROPERTIES
LINK_FLAGS "${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS}"