diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/nvdimm/btt.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/nvdimm/btt.c')
| -rw-r--r-- | drivers/nvdimm/btt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 88e91666f145..368795aad5c9 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c | |||
| @@ -1269,6 +1269,7 @@ static int btt_blk_init(struct btt *btt) | |||
| 1269 | } | 1269 | } |
| 1270 | } | 1270 | } |
| 1271 | set_capacity(btt->btt_disk, btt->nlba * btt->sector_size >> 9); | 1271 | set_capacity(btt->btt_disk, btt->nlba * btt->sector_size >> 9); |
| 1272 | btt->nd_btt->size = btt->nlba * (u64)btt->sector_size; | ||
| 1272 | revalidate_disk(btt->btt_disk); | 1273 | revalidate_disk(btt->btt_disk); |
| 1273 | 1274 | ||
| 1274 | return 0; | 1275 | return 0; |