leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'parisc-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Browse Source 
Pull parisc fixes from Helge Deller:
 "One link error fix found by the kernel test robot, one sparse warning
  fix, remove a duplicate declaration and some spelling fixes"

* 'parisc-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: math-emu: Few spelling fixes in the file fpu.h
  parisc: avoid a warning on u8 cast for cmpxchg on u8 pointers
  parisc: parisc-agp requires SBA IOMMU driver
  parisc: Remove duplicate struct task_struct declaration
This commit is contained in:
Linus Torvalds 2021-04-07 09:20:07 -07:00
commit dbaa5d1c25
4 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/parisc/include/asm/cmpxchg.h
View File

@ -72,7 +72,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
#endif #endif
case 4: return __cmpxchg_u32((unsigned int *)ptr, case 4: return __cmpxchg_u32((unsigned int *)ptr,
(unsigned int)old, (unsigned int)new_); (unsigned int)old, (unsigned int)new_);
case 1: return __cmpxchg_u8((u8 *)ptr, (u8)old, (u8)new_); case 1: return __cmpxchg_u8((u8 *)ptr, old & 0xff, new_ & 0xff);
} }
__cmpxchg_called_with_bad_pointer(); __cmpxchg_called_with_bad_pointer();
return old; return old;

1
arch/parisc/include/asm/processor.h
View File

@ -272,7 +272,6 @@ on downward growing arches, it looks like this:
regs->gr[23] = 0; \ regs->gr[23] = 0; \
} while(0) } while(0)
struct task_struct;
struct mm_struct; struct mm_struct;
/* Free all resources held by a thread. */ /* Free all resources held by a thread. */

32
arch/parisc/math-emu/fpu.h
View File

@ -5,34 +5,10 @@
* Floating-point emulation code * Floating-point emulation code
* Copyright (C) 2001 Hewlett-Packard (Paul Bame) <bame@debian.org> * Copyright (C) 2001 Hewlett-Packard (Paul Bame) <bame@debian.org>
*/ */
/*
* BEGIN_DESC
*
* File:
* @(#) pa/fp/fpu.h $Revision: 1.1 $
*
* Purpose:
* <<please update with a synopis of the functionality provided by this file>>
*
*
* END_DESC
*/
#ifdef __NO_PA_HDRS
PA header file -- do not include this header file for non-PA builds.
#endif
#ifndef _MACHINE_FPU_INCLUDED /* allows multiple inclusion */ #ifndef _MACHINE_FPU_INCLUDED /* allows multiple inclusion */
#define _MACHINE_FPU_INCLUDED #define _MACHINE_FPU_INCLUDED
#if 0
#ifndef _SYS_STDSYMS_INCLUDED
# include <sys/stdsyms.h>
#endif /* _SYS_STDSYMS_INCLUDED */
#include <machine/pdc/pdc_rqsts.h>
#endif
#define PA83_FPU_FLAG 0x00000001 #define PA83_FPU_FLAG 0x00000001
#define PA89_FPU_FLAG 0x00000002 #define PA89_FPU_FLAG 0x00000002
#define PA2_0_FPU_FLAG 0x00000010 #define PA2_0_FPU_FLAG 0x00000010
@ -43,21 +19,19 @@
#define COPR_FP 0x00000080 /* Floating point -- Coprocessor 0 */ #define COPR_FP 0x00000080 /* Floating point -- Coprocessor 0 */
#define SFU_MPY_DIVIDE 0x00008000 /* Multiply/Divide __ SFU 0 */ #define SFU_MPY_DIVIDE 0x00008000 /* Multiply/Divide __ SFU 0 */
#define EM_FPU_TYPE_OFFSET 272 #define EM_FPU_TYPE_OFFSET 272
/* version of EMULATION software for COPR,0,0 instruction */ /* version of EMULATION software for COPR,0,0 instruction */
#define EMULATION_VERSION 4 #define EMULATION_VERSION 4
/* /*
* The only was to differeniate between TIMEX and ROLEX (or PCX-S and PCX-T) * The only way to differentiate between TIMEX and ROLEX (or PCX-S and PCX-T)
* is thorough the potential type field from the PDC_MODEL call. The * is through the potential type field from the PDC_MODEL call.
* following flags are used at assist this differeniation. * The following flags are used to assist this differentiation.
*/ */
#define ROLEX_POTENTIAL_KEY_FLAGS PDC_MODEL_CPU_KEY_WORD_TO_IO #define ROLEX_POTENTIAL_KEY_FLAGS PDC_MODEL_CPU_KEY_WORD_TO_IO
#define TIMEX_POTENTIAL_KEY_FLAGS (PDC_MODEL_CPU_KEY_QUAD_STORE | \ #define TIMEX_POTENTIAL_KEY_FLAGS (PDC_MODEL_CPU_KEY_QUAD_STORE | \
PDC_MODEL_CPU_KEY_RECIP_SQRT) PDC_MODEL_CPU_KEY_RECIP_SQRT)
#endif /* ! _MACHINE_FPU_INCLUDED */ #endif /* ! _MACHINE_FPU_INCLUDED */

2
drivers/char/agp/Kconfig
View File

@ -125,7 +125,7 @@ config AGP_HP_ZX1
config AGP_PARISC config AGP_PARISC
tristate "HP Quicksilver AGP support" tristate "HP Quicksilver AGP support"
depends on AGP && PARISC && 64BIT depends on AGP && PARISC && 64BIT && IOMMU_SBA
help help
This option gives you AGP GART support for the HP Quicksilver This option gives you AGP GART support for the HP Quicksilver
AGP bus adapter on HP PA-RISC machines (Ok, just on the C8000 AGP bus adapter on HP PA-RISC machines (Ok, just on the C8000