Unverified Commit 018e26e4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13359 [OLK-6.6] [Backport] individual submission 

Merge Pull Request from: @yongzhenzhang 
 
[Backport] individual submissions from kernel.org up to now

MIPS: RB532: Declare prom_setup_cmdline() and rb532_gpio_init() static
MIPS: BCM47XX: Declare early_tlb_init() static
MIPS: BCM47XX: include header for bcm47xx_prom_highmem_init() prototype
ocfs2: spelling fix 
 
Link:https://gitee.com/openeuler/kernel/pulls/13359

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b69e9a08 26fcfdd6

arch/mips/bcm47xx/prom.c

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/bootinfo.h>

#include <bcm47xx.h>

#include <bcm47xx_board.h>

#include "bcm47xx_private.h"



static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
@@ -123,7 +124,7 @@ void __init prom_init(void) 
/* Stripped version of tlb_init, with the call to build_tlb_refill_handler

 * dropped. Calling it at this stage causes a hang.

 */

void early_tlb_init(void)

static void early_tlb_init(void)

{

	write_c0_pagemask(PM_DEFAULT_MASK);

	write_c0_wired(0);

arch/mips/rb532/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void rb532_gpio_set_func(unsigned gpio) 
}

EXPORT_SYMBOL(rb532_gpio_set_func);



int __init rb532_gpio_init(void)

static int __init rb532_gpio_init(void)

{

	struct resource *r;

arch/mips/rb532/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline unsigned long tag2ul(char *arg, const char *tag) 
	return simple_strtoul(num, 0, 10);

}



void __init prom_setup_cmdline(void)

static void __init prom_setup_cmdline(void)

{

	static char cmd_line[COMMAND_LINE_SIZE] __initdata;

	char *cp, *board;

fs/ocfs2/dlmglue.c

+1 −1
Original line number Diff line number Diff line
@@ -1615,7 +1615,7 @@ static int __ocfs2_cluster_lock(struct ocfs2_super *osb, 
unlock:

	lockres_clear_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING);



	/* ocfs2_unblock_lock reques on seeing OCFS2_LOCK_UPCONVERT_FINISHING */

	/* ocfs2_unblock_lock request on seeing OCFS2_LOCK_UPCONVERT_FINISHING */

	kick_dc = (lockres->l_flags & OCFS2_LOCK_BLOCKED);



	spin_unlock_irqrestore(&lockres->l_lock, flags);