Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile changes from Chris Metcalf: "These mostly just address smaller issues reported to me" * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch: tile: kernel: unaligned.c: Cleaning up uninitialized variables drivers/tty/hvc/hvc_tile.c: use PTR_ERR_OR_ZERO replace strict_strto* call with kstrto* tile: Update comments for generic idle conversion tile: cleanup the comment in init_pgprot tile: use BOOTMEM_DEFAULT instead of magic number 0 for reserve_bootmem flags
This commit is contained in:
@@ -273,9 +273,9 @@ static pgprot_t __init init_pgprot(ulong address)
|
||||
/*
|
||||
* Otherwise we just hand out consecutive cpus. To avoid
|
||||
* requiring this function to hold state, we just walk forward from
|
||||
* _sdata by PAGE_SIZE, skipping the readonly and init data, to reach
|
||||
* the requested address, while walking cpu home around kdata_mask.
|
||||
* This is typically no more than a dozen or so iterations.
|
||||
* __end_rodata by PAGE_SIZE, skipping the readonly and init data, to
|
||||
* reach the requested address, while walking cpu home around
|
||||
* kdata_mask. This is typically no more than a dozen or so iterations.
|
||||
*/
|
||||
page = (((ulong)__end_rodata) + PAGE_SIZE - 1) & PAGE_MASK;
|
||||
BUG_ON(address < page || address >= (ulong)_end);
|
||||
@@ -912,7 +912,7 @@ static long __write_once initfree = 1;
|
||||
static int __init set_initfree(char *str)
|
||||
{
|
||||
long val;
|
||||
if (strict_strtol(str, 0, &val) == 0) {
|
||||
if (kstrtol(str, 0, &val) == 0) {
|
||||
initfree = val;
|
||||
pr_info("initfree: %s free init pages\n",
|
||||
initfree ? "will" : "won't");
|
||||
|
مرجع در شماره جدید
Block a user