diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-09-04 11:35:54 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-09-04 11:35:54 -0700 |
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /drivers/misc/sgi-xp/xpc_partition.c | |
| parent | security/capabilities: remove check for -EINVAL (diff) | |
| parent | Linux 4.19-rc2 (diff) | |
| download | linux-dev-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.tar.xz linux-dev-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.zip | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to '')
| -rw-r--r-- | drivers/misc/sgi-xp/xpc_partition.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c index 7284413dabfd..0c3ef6f1df54 100644 --- a/drivers/misc/sgi-xp/xpc_partition.c +++ b/drivers/misc/sgi-xp/xpc_partition.c @@ -415,7 +415,6 @@ xpc_discovery(void) int region_size; int max_regions; int nasid; - struct xpc_rsvd_page *rp; unsigned long *discovered_nasids; enum xp_retval ret; @@ -432,8 +431,6 @@ xpc_discovery(void) return; } - rp = (struct xpc_rsvd_page *)xpc_rsvd_page; - /* * The term 'region' in this context refers to the minimum number of * nodes that can comprise an access protection grouping. The access @@ -449,8 +446,10 @@ xpc_discovery(void) switch (region_size) { case 128: max_regions *= 2; + /* fall through */ case 64: max_regions *= 2; + /* fall through */ case 32: max_regions *= 2; region_size = 16; |