microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc 

* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
  [POWERPC] Fix Kconfig warning
  [PPC] Fix modpost warning
  [POWERPC] Fix modpost warning
  [POWERPC] Fix Section mismatch warnings
  [POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
  [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
  [PPC] Remove duplicate export of __div64_32.
  [PPC] Fix COMMON symbol warnings
This commit is contained in:
Linus Torvalds 2007-05-29 13:42:28 -07:00
Родитель a43266355b 58da10bb3f
Коммит 5566321937
13 изменённых файлов: 39 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
arch/powerpc/Kconfig
Просмотреть файл

@ -118,6 +118,7 @@ config GENERIC_BUG
depends on BUG depends on BUG
config SYS_SUPPORTS_APM_EMULATION config SYS_SUPPORTS_APM_EMULATION
default y if PMAC_APM_EMU
bool bool
config DEFAULT_UIMAGE config DEFAULT_UIMAGE

2
arch/powerpc/boot/dts/lite5200.dts
Просмотреть файл

@ -67,7 +67,7 @@
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200_pic"; compatible = "mpc5200-pic";
reg = <500 80>; reg = <500 80>;
built-in; built-in;
}; };

2
arch/powerpc/boot/dts/lite5200b.dts
Просмотреть файл

@ -67,7 +67,7 @@
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200b-pic\0mpc5200_pic"; compatible = "mpc5200b-pic\0mpc5200-pic";
reg = <500 80>; reg = <500 80>;
built-in; built-in;
}; };

2
arch/powerpc/mm/pgtable_32.c
Просмотреть файл

@ -93,7 +93,7 @@ void pgd_free(pgd_t *pgd)
free_pages((unsigned long)pgd, PGDIR_ORDER); free_pages((unsigned long)pgd, PGDIR_ORDER);
} }
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) __init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{ {
pte_t *pte; pte_t *pte;
extern int mem_init_done; extern int mem_init_done;

2
arch/powerpc/platforms/chrp/pegasos_eth.c
Просмотреть файл

@ -169,7 +169,7 @@ static int Enable_SRAM(void)
/***********/ /***********/
/***********/ /***********/
int mv643xx_eth_add_pds(void) static int __init mv643xx_eth_add_pds(void)
{ {
int ret = 0; int ret = 0;
static struct pci_device_id pci_marvell_mv64360[] = { static struct pci_device_id pci_marvell_mv64360[] = {

2
arch/powerpc/platforms/powermac/setup.c
Просмотреть файл

@ -384,7 +384,7 @@ int boot_part;
static dev_t boot_dev; static dev_t boot_dev;
#ifdef CONFIG_SCSI #ifdef CONFIG_SCSI
void __init note_scsi_host(struct device_node *node, void *host) void note_scsi_host(struct device_node *node, void *host)
{ {
int l; int l;
char *p; char *p;

4
arch/powerpc/sysdev/qe_lib/Kconfig
Просмотреть файл

@ -5,15 +5,13 @@
config UCC_SLOW config UCC_SLOW
bool bool
default n default n
select UCC
help help
This option provides qe_lib support to UCC slow This option provides qe_lib support to UCC slow
protocols: UART, BISYNC, QMC protocols: UART, BISYNC, QMC
config UCC_FAST config UCC_FAST
bool bool
default n default y if UCC_GETH
select UCC
help help
This option provides qe_lib support to UCC fast This option provides qe_lib support to UCC fast
protocols: HDLC, Ethernet, ATM, transparent protocols: HDLC, Ethernet, ATM, transparent

18
arch/ppc/kernel/entry.S
Просмотреть файл

@ -596,7 +596,11 @@ fast_exception_return:
mr r12,r4 /* restart at exc_exit_restart */ mr r12,r4 /* restart at exc_exit_restart */
b 2b b 2b
.comm fee_restarts,4 .section .bss
.align 2
fee_restarts:
.space 4
.previous
/* aargh, a nonrecoverable interrupt, panic */ /* aargh, a nonrecoverable interrupt, panic */
/* aargh, we don't know which trap this is */ /* aargh, we don't know which trap this is */
@ -851,7 +855,11 @@ load_dbcr0:
mtspr SPRN_DBSR,r11 /* clear all pending debug events */ mtspr SPRN_DBSR,r11 /* clear all pending debug events */
blr blr
.comm global_dbcr0,8 .section .bss
.align 4
global_dbcr0:
.space 8
.previous
#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
do_work: /* r10 contains MSR_KERNEL here */ do_work: /* r10 contains MSR_KERNEL here */
@ -926,4 +934,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
/* shouldn't return */ /* shouldn't return */
b 4b b 4b
.comm ee_restarts,4 .section .bss
.align 2
ee_restarts:
.space 4
.previous

2
arch/ppc/kernel/ppc_ksyms.c
Просмотреть файл

@ -40,7 +40,6 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/btext.h> #include <asm/btext.h>
#include <asm/div64.h>
#include <asm/xmon.h> #include <asm/xmon.h>
#include <asm/signal.h> #include <asm/signal.h>
#include <asm/dcr.h> #include <asm/dcr.h>
@ -93,7 +92,6 @@ EXPORT_SYMBOL(strncpy);
EXPORT_SYMBOL(strcat); EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strlen); EXPORT_SYMBOL(strlen);
EXPORT_SYMBOL(strcmp); EXPORT_SYMBOL(strcmp);
EXPORT_SYMBOL(__div64_32);
EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(csum_partial);
EXPORT_SYMBOL(csum_partial_copy_generic); EXPORT_SYMBOL(csum_partial_copy_generic);

20
arch/ppc/mm/hashtable.S
Просмотреть файл

@ -30,7 +30,11 @@
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.comm mmu_hash_lock,4 .section .bss
.align 2
.globl mmu_hash_lock
mmu_hash_lock:
.space 4
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
/* /*
@ -461,9 +465,17 @@ found_slot:
sync /* make sure pte updates get to memory */ sync /* make sure pte updates get to memory */
blr blr
.comm next_slot,4 .section .bss
.comm primary_pteg_full,4 .align 2
.comm htab_hash_searches,4 next_slot:
.space 4
.globl primary_pteg_full
primary_pteg_full:
.space 4
.globl htab_hash_searches
htab_hash_searches:
.space 4
.previous
/* /*
* Flush the entry for a particular page from the hash table. * Flush the entry for a particular page from the hash table.

2
arch/ppc/mm/pgtable.c
Просмотреть файл

@ -92,7 +92,7 @@ void pgd_free(pgd_t *pgd)
free_pages((unsigned long)pgd, PGDIR_ORDER); free_pages((unsigned long)pgd, PGDIR_ORDER);
} }
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) __init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{ {
pte_t *pte; pte_t *pte;
extern int mem_init_done; extern int mem_init_done;

1
drivers/macintosh/Kconfig
Просмотреть файл

@ -113,7 +113,6 @@ config PMAC_SMU
config PMAC_APM_EMU config PMAC_APM_EMU
tristate "APM emulation" tristate "APM emulation"
select SYS_SUPPORTS_APM_EMULATION
select APM_EMULATION select APM_EMULATION
depends on ADB_PMU && PM depends on ADB_PMU && PM

1
drivers/net/Kconfig
Просмотреть файл

@ -2280,7 +2280,6 @@ config GFAR_NAPI
config UCC_GETH config UCC_GETH
tristate "Freescale QE Gigabit Ethernet" tristate "Freescale QE Gigabit Ethernet"
depends on QUICC_ENGINE depends on QUICC_ENGINE
select UCC_FAST
help help
This driver supports the Gigabit Ethernet mode of the QUICC Engine, This driver supports the Gigabit Ethernet mode of the QUICC Engine,
which is available on some Freescale SOCs. which is available on some Freescale SOCs.