projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[cascardo/linux.git]
/
drivers
/
char
/
mbcs.c
diff --git
a/drivers/char/mbcs.c
b/drivers/char/mbcs.c
index
acd8e9e
..
87c67b4
100644
(file)
--- a/
drivers/char/mbcs.c
+++ b/
drivers/char/mbcs.c
@@
-15,6
+15,7
@@
#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/ioport.h>
#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/ioport.h>
+#include <linux/kernel.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/init.h>
@@
-715,8
+716,8
@@
static ssize_t show_algo(struct device *dev, struct device_attribute *attr, char
*/
debug0 = *(uint64_t *) soft->debug_addr;
*/
debug0 = *(uint64_t *) soft->debug_addr;
- return sprintf(buf, "0x%
lx 0x%l
x\n",
-
(debug0 >> 32), (debug0 & 0xffffffff
));
+ return sprintf(buf, "0x%
x 0x%
x\n",
+
upper_32_bits(debug0), lower_32_bits(debug0
));
}
static ssize_t store_algo(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
}
static ssize_t store_algo(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)