Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
2c250ad2
Commit
2c250ad2
authored
Feb 10, 2011
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixes' into for-next
parents
e9a623be
9804c9ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
8 deletions
+18
-8
arch/parisc/include/asm/cacheflush.h
arch/parisc/include/asm/cacheflush.h
+17
-7
arch/parisc/kernel/irq.c
arch/parisc/kernel/irq.c
+1
-1
No files found.
arch/parisc/include/asm/cacheflush.h
View file @
2c250ad2
...
@@ -35,6 +35,13 @@ void flush_cache_all_local(void);
...
@@ -35,6 +35,13 @@ void flush_cache_all_local(void);
void
flush_cache_all
(
void
);
void
flush_cache_all
(
void
);
void
flush_cache_mm
(
struct
mm_struct
*
mm
);
void
flush_cache_mm
(
struct
mm_struct
*
mm
);
#define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
void
flush_kernel_dcache_page_addr
(
void
*
addr
);
static
inline
void
flush_kernel_dcache_page
(
struct
page
*
page
)
{
flush_kernel_dcache_page_addr
(
page_address
(
page
));
}
#define flush_kernel_dcache_range(start,size) \
#define flush_kernel_dcache_range(start,size) \
flush_kernel_dcache_range_asm((start), (start)+(size));
flush_kernel_dcache_range_asm((start), (start)+(size));
/* vmap range flushes and invalidates. Architecturally, we don't need
/* vmap range flushes and invalidates. Architecturally, we don't need
...
@@ -48,6 +55,16 @@ static inline void flush_kernel_vmap_range(void *vaddr, int size)
...
@@ -48,6 +55,16 @@ static inline void flush_kernel_vmap_range(void *vaddr, int size)
}
}
static
inline
void
invalidate_kernel_vmap_range
(
void
*
vaddr
,
int
size
)
static
inline
void
invalidate_kernel_vmap_range
(
void
*
vaddr
,
int
size
)
{
{
unsigned
long
start
=
(
unsigned
long
)
vaddr
;
void
*
cursor
=
vaddr
;
for
(
;
cursor
<
vaddr
+
size
;
cursor
+=
PAGE_SIZE
)
{
struct
page
*
page
=
vmalloc_to_page
(
cursor
);
if
(
test_and_clear_bit
(
PG_dcache_dirty
,
&
page
->
flags
))
flush_kernel_dcache_page
(
page
);
}
flush_kernel_dcache_range_asm
(
start
,
start
+
size
);
}
}
#define flush_cache_vmap(start, end) flush_cache_all()
#define flush_cache_vmap(start, end) flush_cache_all()
...
@@ -99,13 +116,6 @@ flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vma
...
@@ -99,13 +116,6 @@ flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vma
flush_dcache_page_asm
(
page_to_phys
(
page
),
vmaddr
);
flush_dcache_page_asm
(
page_to_phys
(
page
),
vmaddr
);
}
}
#define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
void
flush_kernel_dcache_page_addr
(
void
*
addr
);
static
inline
void
flush_kernel_dcache_page
(
struct
page
*
page
)
{
flush_kernel_dcache_page_addr
(
page_address
(
page
));
}
#ifdef CONFIG_DEBUG_RODATA
#ifdef CONFIG_DEBUG_RODATA
void
mark_rodata_ro
(
void
);
void
mark_rodata_ro
(
void
);
#endif
#endif
...
...
arch/parisc/kernel/irq.c
View file @
2c250ad2
...
@@ -108,7 +108,7 @@ int cpu_check_affinity(unsigned int irq, const struct cpumask *dest)
...
@@ -108,7 +108,7 @@ int cpu_check_affinity(unsigned int irq, const struct cpumask *dest)
int
cpu_dest
;
int
cpu_dest
;
/* timer and ipi have to always be received on all CPUs */
/* timer and ipi have to always be received on all CPUs */
if
(
CHECK_IRQ_PER_CPU
(
irq
))
{
if
(
CHECK_IRQ_PER_CPU
(
irq
_to_desc
(
irq
)
->
status
))
{
/* Bad linux design decision. The mask has already
/* Bad linux design decision. The mask has already
* been set; we must reset it */
* been set; we must reset it */
cpumask_setall
(
irq_desc
[
irq
].
affinity
);
cpumask_setall
(
irq_desc
[
irq
].
affinity
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment