diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 19:39:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 19:39:15 -0400 |
commit | eea3a00264cf243a28e4331566ce67b86059339d (patch) | |
tree | 487f16389e0dfa32e9caa7604d1274a7dcda8f04 /kernel/resource.c | |
parent | e7c82412433a8039616c7314533a0a1c025d99bf (diff) | |
parent | e693d73c20ffdb06840c9378f367bad849ac0d5d (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge second patchbomb from Andrew Morton:
- the rest of MM
- various misc bits
- add ability to run /sbin/reboot at reboot time
- printk/vsprintf changes
- fiddle with seq_printf() return value
* akpm: (114 commits)
parisc: remove use of seq_printf return value
lru_cache: remove use of seq_printf return value
tracing: remove use of seq_printf return value
cgroup: remove use of seq_printf return value
proc: remove use of seq_printf return value
s390: remove use of seq_printf return value
cris fasttimer: remove use of seq_printf return value
cris: remove use of seq_printf return value
openrisc: remove use of seq_printf return value
ARM: plat-pxa: remove use of seq_printf return value
nios2: cpuinfo: remove use of seq_printf return value
microblaze: mb: remove use of seq_printf return value
ipc: remove use of seq_printf return value
rtc: remove use of seq_printf return value
power: wakeup: remove use of seq_printf return value
x86: mtrr: if: remove use of seq_printf return value
linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
MAINTAINERS: CREDITS: remove Stefano Brivio from B43
.mailmap: add Ricardo Ribalda
CREDITS: add Ricardo Ribalda Delgado
...
Diffstat (limited to 'kernel/resource.c')
-rw-r--r-- | kernel/resource.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 19f2357dfda3..90552aab5f2d 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -1034,8 +1034,6 @@ resource_size_t resource_alignment(struct resource *res) | |||
1034 | * | 1034 | * |
1035 | * request_region creates a new busy region. | 1035 | * request_region creates a new busy region. |
1036 | * | 1036 | * |
1037 | * check_region returns non-zero if the area is already busy. | ||
1038 | * | ||
1039 | * release_region releases a matching busy region. | 1037 | * release_region releases a matching busy region. |
1040 | */ | 1038 | */ |
1041 | 1039 | ||
@@ -1098,36 +1096,6 @@ struct resource * __request_region(struct resource *parent, | |||
1098 | EXPORT_SYMBOL(__request_region); | 1096 | EXPORT_SYMBOL(__request_region); |
1099 | 1097 | ||
1100 | /** | 1098 | /** |
1101 | * __check_region - check if a resource region is busy or free | ||
1102 | * @parent: parent resource descriptor | ||
1103 | * @start: resource start address | ||
1104 | * @n: resource region size | ||
1105 | * | ||
1106 | * Returns 0 if the region is free at the moment it is checked, | ||
1107 | * returns %-EBUSY if the region is busy. | ||
1108 | * | ||
1109 | * NOTE: | ||
1110 | * This function is deprecated because its use is racy. | ||
1111 | * Even if it returns 0, a subsequent call to request_region() | ||
1112 | * may fail because another driver etc. just allocated the region. | ||
1113 | * Do NOT use it. It will be removed from the kernel. | ||
1114 | */ | ||
1115 | int __check_region(struct resource *parent, resource_size_t start, | ||
1116 | resource_size_t n) | ||
1117 | { | ||
1118 | struct resource * res; | ||
1119 | |||
1120 | res = __request_region(parent, start, n, "check-region", 0); | ||
1121 | if (!res) | ||
1122 | return -EBUSY; | ||
1123 | |||
1124 | release_resource(res); | ||
1125 | free_resource(res); | ||
1126 | return 0; | ||
1127 | } | ||
1128 | EXPORT_SYMBOL(__check_region); | ||
1129 | |||
1130 | /** | ||
1131 | * __release_region - release a previously reserved resource region | 1099 | * __release_region - release a previously reserved resource region |
1132 | * @parent: parent resource descriptor | 1100 | * @parent: parent resource descriptor |
1133 | * @start: resource start address | 1101 | * @start: resource start address |