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

Metag architecture changes for v3.17 

Just a couple of minor static analysis fixes, removal of a NULL check
 that should never happen, and fix an error check where an unsigned value
 was being checked to see if it was negative.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJT6JHIAAoJEGwLaZPeOHZ6dfoP/0NrVlO+ldKALXEaPXvLyiWN
 MAhWt8xMHoTsgGlnbnr4Gi6mDDuSnH9CvCoelE/Htn4UOnNbH1bZ/XKJ9gyfnoIv
 NM0xlInWd9dN1PObgcLONBG5KF9vSb8yMhzCZ+GJYZY7mWmjp7641csLL+ksC5uD
 +qkl6+/RsEAXNHC9Hnzib0zpUf/q+u1ZWa5LmvoUTtCuOfdCEeAN+oCuM7+/d9vd
 iyrzXTzdLOn8OA6biNWHH9OVzBEvmAvkJbhccBN1VOUi85OWnmCMrBkB11T9hUSp
 +O2lNfAJYZfqf51OMh8OmdBhcN+GxJf8YIgJqlfzbEzKDRCqhUvvYIDI0tXmTKIC
 CSkifBSWfyi8/+Nrijs+8Z/q7EJJ3VHX2AFwQlZM1eH4cZR4MM0AmSAGsu+vwGsA
 QwkHRcKKqGJUXGusw5+ezPYy7Esn23KkWIBjucZm2gRc1zb+KqB8+TnypJMIpl5U
 Kf8yWahptEH9fTFjqu557E29Oe0lb9fKRGPovdLfcQ9jMNHaZHoix19+kMO+dol2
 LgKhvt1OEC/NCZf/FjFwOvkdRWmkbOLyn2NJinmCGpAmT88LUI/vcpGHpjWgdxhd
 svDd/hFxIUnv10E9wPf27UMrS5zVKJ1loPfQ8N6m89/q3Mx1Q+zErgeq6TWfWBAm
 UJG8U2dv4JeIWUHmcSQ+
 =3kq/
 -----END PGP SIGNATURE-----

Merge tag 'metag-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull metag architecture updates from James Hogan:
 "Just a couple of minor static analysis fixes, removal of a NULL check
  that should never happen, and fix an error check where an unsigned
  value was being checked to see if it was negative"

* tag 'metag-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: cachepart: Fix failure check
  metag: hugetlbpage: Remove null pointer checks that could never happen
This commit is contained in:
Linus Torvalds 2014-08-13 18:18:09 -06:00
Родитель 06b8ab5528 f93125ae17
Коммит fd1cf90580
2 изменённых файлов: 3 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
arch/metag/kernel/cachepart.c
Просмотреть файл

@ -55,7 +55,7 @@ unsigned int get_global_icache_size(void)
return (get_icache_size() * ((temp >> SYSC_xCPARTG_AND_S) + 1)) >> 4; return (get_icache_size() * ((temp >> SYSC_xCPARTG_AND_S) + 1)) >> 4;
} }
static unsigned int get_thread_cache_size(unsigned int cache, int thread_id) static int get_thread_cache_size(unsigned int cache, int thread_id)
{ {
unsigned int cache_size; unsigned int cache_size;
unsigned int t_cache_part; unsigned int t_cache_part;
@ -94,7 +94,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
void check_for_cache_aliasing(int thread_id) void check_for_cache_aliasing(int thread_id)
{ {
unsigned int thread_cache_size; int thread_cache_size;
unsigned int cache_type; unsigned int cache_type;
for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) { for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) {
thread_cache_size = thread_cache_size =

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

@ -173,7 +173,7 @@ new_search:
mm->context.part_huge = 0; mm->context.part_huge = 0;
return addr; return addr;
} }
if (vma && (vma->vm_flags & MAP_HUGETLB)) { if (vma->vm_flags & MAP_HUGETLB) {
/* space after a huge vma in 2nd level page table? */ /* space after a huge vma in 2nd level page table? */
if (vma->vm_end & HUGEPT_MASK) { if (vma->vm_end & HUGEPT_MASK) {
after_huge = 1; after_huge = 1;