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/firmware/efi/capsule.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/firmware/efi/capsule.c')
| -rw-r--r-- | drivers/firmware/efi/capsule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/efi/capsule.c b/drivers/firmware/efi/capsule.c index 53b9fd2293ee..6eedff45e6d7 100644 --- a/drivers/firmware/efi/capsule.c +++ b/drivers/firmware/efi/capsule.c | |||
| @@ -190,9 +190,9 @@ efi_capsule_update_locked(efi_capsule_header_t *capsule, | |||
| 190 | * map the capsule described by @capsule with its data in @pages and | 190 | * map the capsule described by @capsule with its data in @pages and |
| 191 | * send it to the firmware via the UpdateCapsule() runtime service. | 191 | * send it to the firmware via the UpdateCapsule() runtime service. |
| 192 | * | 192 | * |
| 193 | * @capsule must be a virtual mapping of the first page in @pages | 193 | * @capsule must be a virtual mapping of the complete capsule update in the |
| 194 | * (@pages[0]) in the kernel address space. That is, a | 194 | * kernel address space, as the capsule can be consumed immediately. |
| 195 | * capsule_header_t that describes the entire contents of the capsule | 195 | * A capsule_header_t that describes the entire contents of the capsule |
| 196 | * must be at the start of the first data page. | 196 | * must be at the start of the first data page. |
| 197 | * | 197 | * |
| 198 | * Even though this function will validate that the firmware supports | 198 | * Even though this function will validate that the firmware supports |