cloud-email/cryptography - python cryptography

diff options

author	Paul Kehrer <paul.l.kehrer@gmail.com>	2014-10-19 22:31:53 -0700
committer	Paul Kehrer <paul.l.kehrer@gmail.com>	2014-10-19 22:31:53 -0700
commit	962f66effa666c161aa93bb55b0f9c4deff67100 (patch)
tree	30376c672f66b12b8b1daf9b69ba1906e128a4c4 /docs/hazmat/primitives
parent	9c2cdcd5e9a62ed97f6d1282d613e52f3db26ee8 (diff)
parent	732fbece8308f5a72dd6d3dbf131292b87182f7d (diff)
download	cryptography-962f66effa666c161aa93bb55b0f9c4deff67100.tar.gz cryptography-962f66effa666c161aa93bb55b0f9c4deff67100.tar.bz2 cryptography-962f66effa666c161aa93bb55b0f9c4deff67100.zip

Merge pull request #1419 from alex/cleanup-fernet

Move the supported marks to class level for fernet

Diffstat (limited to 'docs/hazmat/primitives')

0 files changed, 0 insertions, 0 deletions

--- a/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h @@ -20,10 +20,25 @@ #ifdef CONFIG_BCM47XX #include <asm/paccess.h> #include <linux/ssb/ssb.h> -#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE))) +#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg() + +static inline unsigned long bcm4710_dummy_rreg(void) { + return (*(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE))); +} + +#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void*)(addr)) + +static inline unsigned long bcm4710_fill_tlb(void *addr) { + return (*(unsigned long *)addr); +} + +#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void*)(addr)) + +static inline void bcm4710_protected_fill_tlb(void *addr) { + unsigned long x; + get_dbe(x, (unsigned long *)addr);; +} -#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr)) -#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); }) #else #define BCM4710_DUMMY_RREG() --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -611,6 +611,9 @@ build_get_pgde32(u32 **p, unsigned int t #endif uasm_i_addu(p, ptr, tmp, ptr); #else +#ifdef CONFIG_BCM47XX + uasm_i_nop(p); +#endif UASM_i_LA_mostly(p, ptr, pgdc); #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ @@ -749,12 +752,12 @@ static void __cpuinit build_r4000_tlb_re /* No need for uasm_i_nop */ } -#ifdef CONFIG_BCM47XX - uasm_i_nop(&p); -#endif #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else +# ifdef CONFIG_BCM47XX + uasm_i_nop(&p); +# endif build_get_pgde32(&p, K0, K1); /* get pgd in K1 */ #endif @@ -766,6 +769,9 @@ static void __cpuinit build_r4000_tlb_re build_update_entries(&p, K0, K1); build_tlb_write_entry(&p, &l, &r, tlb_random); uasm_l_leave(&l, p); +#ifdef CONFIG_BCM47XX + uasm_i_nop(&p); +#endif uasm_i_eret(&p); /* return from trap */ #ifdef CONFIG_HUGETLB_PAGE @@ -1206,12 +1212,12 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { -#ifdef CONFIG_BCM47XX - uasm_i_nop(p); -#endif #ifdef CONFIG_64BIT build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */ #else +# ifdef CONFIG_BCM47XX + uasm_i_nop(p); +# endif build_get_pgde32(p, pte, ptr); /* get pgd in ptr */ #endif @@ -1248,6 +1254,9 @@ build_r4000_tlbchange_handler_tail(u32 * build_update_entries(p, tmp, ptr); build_tlb_write_entry(p, l, r, tlb_indexed); uasm_l_leave(l, *p); +#ifdef CONFIG_BCM47XX + uasm_i_nop(p); +#endif uasm_i_eret(p); /* return from trap */ #ifdef CONFIG_64BIT --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -22,6 +22,19 @@ #include <asm/page.h> #include <asm/thread_info.h> +#ifdef CONFIG_BCM47XX +# ifdef eret +# undef eret +# endif +# define eret \ + .set push; \ + .set noreorder; \ + nop; \ + nop; \ + eret; \ + .set pop; +#endif + #define PANIC_PIC(msg) \ .set push; \ .set reorder; \ @@ -54,7 +67,6 @@ NESTED(except_vec3_generic, 0, sp) .set noat #ifdef CONFIG_BCM47XX nop - nop #endif #if R5432_CP0_INTERRUPT_WAR mfc0 k0, CP0_INDEX @@ -79,6 +91,9 @@ NESTED(except_vec3_r4000, 0, sp) .set push .set mips3 .set noat +#ifdef CONFIG_BCM47XX + nop +#endif mfc0 k1, CP0_CAUSE li k0, 31<<2 andi k1, k1, 0x7c


context:
space:
mode: