Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242488
b: refs/heads/master
c: 4cc6953
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Mar 23, 2011
1 parent 6e053b7 commit 22bc0a1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 71189284e61fd818547430186f524c1db54fb7c7
refs/heads/master: 4cc69531f91dfa1668af5e9d8efe9e3bc7b64548
8 changes: 8 additions & 0 deletions trunk/arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,15 @@ static struct resource data_resource = {
.flags = IORESOURCE_BUSY | IORESOURCE_MEM,
};

static struct resource bss_resource = {
.name = "Kernel bss",
.flags = IORESOURCE_BUSY | IORESOURCE_MEM,
};

static struct resource __initdata *standard_resources[] = {
&code_resource,
&data_resource,
&bss_resource,
};

static void __init setup_resources(void)
Expand All @@ -450,6 +456,8 @@ static void __init setup_resources(void)
code_resource.end = (unsigned long) &_etext - 1;
data_resource.start = (unsigned long) &_etext;
data_resource.end = (unsigned long) &_edata - 1;
bss_resource.start = (unsigned long) &__bss_start;
bss_resource.end = (unsigned long) &__bss_stop - 1;

for (i = 0; i < MEMORY_CHUNKS; i++) {
if (!memory_chunk[i].size)
Expand Down

0 comments on commit 22bc0a1

Please sign in to comment.