diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-29 18:29:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-29 18:29:16 -0800 |
| commit | 9df2d392815da06f0cbb18a60975abe3e0120245 (patch) | |
| tree | c227129606bbb15e8c7c8c02acd7f16d30f7db0d /kernel | |
| parent | ba9558cddc654c117acacccf2713ed101b0fc891 (diff) | |
| parent | 4445b58eb2f5e5b20d21c4cf440a5b0f91037e3e (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/kconfig
into home.transmeta.com:/home/torvalds/v2.5/newconfig
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ksyms.c | 1 | ||||
| -rw-r--r-- | kernel/module.c | 2 | ||||
| -rw-r--r-- | kernel/resource.c | 14 |
3 files changed, 1 insertions, 16 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 190fb0c1f0cb..7ecffcd552d1 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -445,7 +445,6 @@ EXPORT_SYMBOL(enable_hlt); EXPORT_SYMBOL(request_resource); EXPORT_SYMBOL(release_resource); EXPORT_SYMBOL(allocate_resource); -EXPORT_SYMBOL(check_resource); EXPORT_SYMBOL(__request_region); EXPORT_SYMBOL(__check_region); EXPORT_SYMBOL(__release_region); diff --git a/kernel/module.c b/kernel/module.c index 8c776f07e765..6b8bd749e436 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1165,7 +1165,7 @@ static void *s_start(struct seq_file *m, loff_t *pos) if (!p) return ERR_PTR(-ENOMEM); lock_kernel(); - for (v = module_list, n = *pos; v; n -= v->nsyms, v = v->next) { + for (v = module_list; v; n -= v->nsyms, v = v->next) { if (n < v->nsyms) { p->mod = v; p->index = n; diff --git a/kernel/resource.c b/kernel/resource.c index 57541cc03d09..9664ad073db7 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -131,20 +131,6 @@ int release_resource(struct resource *old) return retval; } -int check_resource(struct resource *root, unsigned long start, unsigned long len) -{ - struct resource *conflict, tmp; - - tmp.start = start; - tmp.end = start + len - 1; - write_lock(&resource_lock); - conflict = __request_resource(root, &tmp); - if (!conflict) - __release_resource(&tmp); - write_unlock(&resource_lock); - return conflict ? -EBUSY : 0; -} - /* * Find empty slot in the resource tree given range and alignment. */ |