summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-07-12 21:26:51 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-07-12 21:26:51 -0700
commit692dd963da02f24ced2c84773b7229e17610a3d8 (patch)
tree11e88106be9b260d33e930d6db3c9ea8b3becadf /kernel
parentbfba17d3104fb55f4a53899739591aed031a5a84 (diff)
parent5af7d0d99dff67a314baa9378e8bc28a70a883f7 (diff)
Merge bk://linux-dj.bkbits.net/agpgart
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sys.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 2aa8d38eb5ba..4c3f48c93148 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -233,6 +233,8 @@ cond_syscall(compat_sys_futex)
cond_syscall(sys_epoll_create)
cond_syscall(sys_epoll_ctl)
cond_syscall(sys_epoll_wait)
+cond_syscall(sys_pciconfig_read)
+cond_syscall(sys_pciconfig_write)
static int set_one_prio(struct task_struct *p, int niceval, int error)
{