aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/resource.c')
-rw-r--r--kernel/resource.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/resource.c b/kernel/resource.c
index 96afc8027487..61512e972ece 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -949,6 +949,7 @@ static void __init __reserve_region_with_split(struct resource *root,
949 res->start = start; 949 res->start = start;
950 res->end = end; 950 res->end = end;
951 res->flags = IORESOURCE_BUSY; 951 res->flags = IORESOURCE_BUSY;
952 res->desc = IORES_DESC_NONE;
952 953
953 while (1) { 954 while (1) {
954 955
@@ -983,6 +984,7 @@ static void __init __reserve_region_with_split(struct resource *root,
983 next_res->start = conflict->end + 1; 984 next_res->start = conflict->end + 1;
984 next_res->end = end; 985 next_res->end = end;
985 next_res->flags = IORESOURCE_BUSY; 986 next_res->flags = IORESOURCE_BUSY;
987 next_res->desc = IORES_DESC_NONE;
986 } 988 }
987 } else { 989 } else {
988 res->start = conflict->end + 1; 990 res->start = conflict->end + 1;
@@ -1074,6 +1076,7 @@ struct resource * __request_region(struct resource *parent,
1074 res->end = start + n - 1; 1076 res->end = start + n - 1;
1075 res->flags = resource_type(parent) | resource_ext_type(parent); 1077 res->flags = resource_type(parent) | resource_ext_type(parent);
1076 res->flags |= IORESOURCE_BUSY | flags; 1078 res->flags |= IORESOURCE_BUSY | flags;
1079 res->desc = IORES_DESC_NONE;
1077 1080
1078 write_lock(&resource_lock); 1081 write_lock(&resource_lock);
1079 1082
@@ -1238,6 +1241,7 @@ int release_mem_region_adjustable(struct resource *parent,
1238 new_res->start = end + 1; 1241 new_res->start = end + 1;
1239 new_res->end = res->end; 1242 new_res->end = res->end;
1240 new_res->flags = res->flags; 1243 new_res->flags = res->flags;
1244 new_res->desc = res->desc;
1241 new_res->parent = res->parent; 1245 new_res->parent = res->parent;
1242 new_res->sibling = res->sibling; 1246 new_res->sibling = res->sibling;
1243 new_res->child = NULL; 1247 new_res->child = NULL;
@@ -1413,6 +1417,7 @@ static int __init reserve_setup(char *str)
1413 res->start = io_start; 1417 res->start = io_start;
1414 res->end = io_start + io_num - 1; 1418 res->end = io_start + io_num - 1;
1415 res->flags = IORESOURCE_BUSY; 1419 res->flags = IORESOURCE_BUSY;
1420 res->desc = IORES_DESC_NONE;
1416 res->child = NULL; 1421 res->child = NULL;
1417 if (request_resource(res->start >= 0x10000 ? &iomem_resource : &ioport_resource, res) == 0) 1422 if (request_resource(res->start >= 0x10000 ? &iomem_resource : &ioport_resource, res) == 0)
1418 reserved = x+1; 1423 reserved = x+1;