public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'sh/stable-updates'

Browse source
This commit is contained in:
Paul Mundt 2009-10-27 17:10:24 +09:00
commit 9b3b21f788
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/sh/Kconfig
View file

@ -124,6 +124,9 @@ config SYS_SUPPORTS_APM_EMULATION
bool bool
select ARCH_SUSPEND_POSSIBLE select ARCH_SUSPEND_POSSIBLE
config SYS_SUPPORTS_HUGETLBFS
bool
config SYS_SUPPORTS_SMP config SYS_SUPPORTS_SMP
bool bool
@ -204,6 +207,7 @@ config CPU_SH4
select CPU_HAS_SR_RB select CPU_HAS_SR_RB
select CPU_HAS_FPU if !CPU_SH4AL_DSP select CPU_HAS_FPU if !CPU_SH4AL_DSP
select SYS_SUPPORTS_TMU select SYS_SUPPORTS_TMU
select SYS_SUPPORTS_HUGETLBFS if MMU
config CPU_SH4A config CPU_SH4A
bool bool
@ -218,6 +222,7 @@ config CPU_SH5
bool bool
select CPU_HAS_FPU select CPU_HAS_FPU
select SYS_SUPPORTS_TMU select SYS_SUPPORTS_TMU
select SYS_SUPPORTS_HUGETLBFS if MMU
config CPU_SHX2 config CPU_SHX2
bool bool

1
arch/sh/Makefile
View file

@ -225,6 +225,7 @@ define archhelp
@echo ' vmlinux.srec - Create an ELF S-record' @echo ' vmlinux.srec - Create an ELF S-record'
@echo '* uImage - Alias to bootable U-Boot image' @echo '* uImage - Alias to bootable U-Boot image'
@echo ' uImage.srec - Create an S-record for U-Boot' @echo ' uImage.srec - Create an S-record for U-Boot'
@echo ' uImage.bin - Kernel-only image for U-Boot (bin)'
@echo '* uImage.gz - Kernel-only image for U-Boot (gzip)' @echo '* uImage.gz - Kernel-only image for U-Boot (gzip)'
@echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)' @echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)'
@echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)' @echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)'

2
arch/sh/mm/Kconfig
View file

@ -225,7 +225,7 @@ endchoice
choice choice
prompt "HugeTLB page size" prompt "HugeTLB page size"
depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU depends on HUGETLB_PAGE
default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB
default HUGETLB_PAGE_SIZE_64K default HUGETLB_PAGE_SIZE_64K

4
fs/Kconfig
View file

@ -135,8 +135,8 @@ config TMPFS_POSIX_ACL
config HUGETLBFS config HUGETLBFS
bool "HugeTLB file system support" bool "HugeTLB file system support"
depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \ depends on X86 || IA64 || PPC64 || SPARC64 || (S390 && 64BIT) || \
(S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN SYS_SUPPORTS_HUGETLBFS || BROKEN
help help
hugetlbfs is a filesystem backing for HugeTLB pages, based on hugetlbfs is a filesystem backing for HugeTLB pages, based on
ramfs. For architectures that support it, say Y here and read ramfs. For architectures that support it, say Y here and read