[ Upstream commits 86fa04b8
  and b10f997b ]

Should return 'long' instead of 'int'.

Thanks to Dimitris Michailidis and Tony Luck.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>