diff options
| author | Tony Luck <tony.luck@intel.com> | 2011-08-02 15:08:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 08:56:38 -0700 |
| commit | ca14f0481bc8653c39e7b2fca81bc5131ac9afa8 (patch) | |
| tree | 2c40b32ec13dae2ec3dc3f3d562245b70d57a9d4 | |
| parent | 9f0c771dfaece0bca44cead53ea6df64e099ae10 (diff) | |
| download | kernel_samsung_aries-ca14f0481bc8653c39e7b2fca81bc5131ac9afa8.zip kernel_samsung_aries-ca14f0481bc8653c39e7b2fca81bc5131ac9afa8.tar.gz kernel_samsung_aries-ca14f0481bc8653c39e7b2fca81bc5131ac9afa8.tar.bz2 | |
efivars: fix warnings when CONFIG_PSTORE=n
commit b728a5c806fb36f9adebf2a862bbd015e074afca upstream.
drivers/firmware/efivars.c:161: warning: ‘utf16_strlen’ defined but not used
utf16_strlen() is only used inside CONFIG_PSTORE - make this "static inline"
to shut the compiler up [thanks to hpa for the suggestion].
drivers/firmware/efivars.c:602: warning: initialization from incompatible pointer type
Between v1 and v2 of this patch series we decided to make the "part" number
unsigned - but missed fixing the stub version of efi_pstore_write()
Acked-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Mike Waychison <mikew@google.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
[took the static part of the patch, not the pstore part, for 3.0-stable,
to fix the compiler warning we had - gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/firmware/efivars.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 0ba8d69..d5106c0 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -150,7 +150,7 @@ utf16_strnlen(efi_char16_t *s, size_t maxlength) return length; } -static unsigned long +static inline unsigned long utf16_strlen(efi_char16_t *s) { return utf16_strnlen(s, ~0UL); |