Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
28247644
Commit
28247644
authored
Dec 14, 2005
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
parents
1542272a
c7868048
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
5 deletions
+20
-5
arch/arm/kernel/module.c
arch/arm/kernel/module.c
+2
-0
arch/arm/mach-pxa/pm.c
arch/arm/mach-pxa/pm.c
+5
-4
arch/ia64/kernel/process.c
arch/ia64/kernel/process.c
+2
-0
drivers/mmc/mmc.c
drivers/mmc/mmc.c
+9
-1
include/asm-arm/elf.h
include/asm-arm/elf.h
+2
-0
No files found.
arch/arm/kernel/module.c
View file @
28247644
...
...
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
break
;
case
R_ARM_PC24
:
case
R_ARM_CALL
:
case
R_ARM_JUMP24
:
offset
=
(
*
(
u32
*
)
loc
&
0x00ffffff
)
<<
2
;
if
(
offset
&
0x02000000
)
offset
-=
0x04000000
;
...
...
arch/arm/mach-pxa/pm.c
View file @
28247644
...
...
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state)
PSPR
=
0
;
/* restore registers */
RESTORE_GPLEVEL
(
0
);
RESTORE_GPLEVEL
(
1
);
RESTORE_GPLEVEL
(
2
);
RESTORE
(
GPDR0
);
RESTORE
(
GPDR1
);
RESTORE
(
GPDR2
);
RESTORE
(
GAFR0_L
);
RESTORE
(
GAFR0_U
);
RESTORE
(
GAFR1_L
);
RESTORE
(
GAFR1_U
);
RESTORE
(
GAFR2_L
);
RESTORE
(
GAFR2_U
);
RESTORE_GPLEVEL
(
0
);
RESTORE_GPLEVEL
(
1
);
RESTORE_GPLEVEL
(
2
);
RESTORE
(
GPDR0
);
RESTORE
(
GPDR1
);
RESTORE
(
GPDR2
);
RESTORE
(
GRER0
);
RESTORE
(
GRER1
);
RESTORE
(
GRER2
);
RESTORE
(
GFER0
);
RESTORE
(
GFER1
);
RESTORE
(
GFER2
);
RESTORE
(
PGSR0
);
RESTORE
(
PGSR1
);
RESTORE
(
PGSR2
);
#ifdef CONFIG_PXA27x
RESTORE
(
MDREFR
);
RESTORE
(
GAFR3_L
);
RESTORE
(
GAFR3_U
);
RESTORE_GPLEVEL
(
3
);
RESTORE
(
GPDR3
);
RESTORE
(
GRER3
);
RESTORE
(
GFER3
);
RESTORE
(
PGSR3
);
RESTORE_GPLEVEL
(
3
);
RESTORE
(
GPDR3
);
RESTORE
(
GAFR3_L
);
RESTORE
(
GAFR3_U
);
RESTORE
(
GRER3
);
RESTORE
(
GFER3
);
RESTORE
(
PGSR3
);
RESTORE
(
PWER
);
RESTORE
(
PCFR
);
RESTORE
(
PRER
);
RESTORE
(
PFER
);
RESTORE
(
PKWR
);
#endif
...
...
arch/ia64/kernel/process.c
View file @
28247644
...
...
@@ -721,11 +721,13 @@ flush_thread (void)
/* drop floating-point and debug-register state if it exists: */
current
->
thread
.
flags
&=
~
(
IA64_THREAD_FPH_VALID
|
IA64_THREAD_DBG_VALID
);
ia64_drop_fpu
(
current
);
#ifdef CONFIG_IA32_SUPPORT
if
(
IS_IA32_PROCESS
(
ia64_task_regs
(
current
)))
{
ia32_drop_partial_page_list
(
current
);
current
->
thread
.
task_size
=
IA32_PAGE_OFFSET
;
set_fs
(
USER_DS
);
}
#endif
}
/*
...
...
drivers/mmc/mmc.c
View file @
28247644
...
...
@@ -679,7 +679,15 @@ static void mmc_idle_cards(struct mmc_host *host)
}
/*
* Apply power to the MMC stack.
* Apply power to the MMC stack. This is a two-stage process.
* First, we enable power to the card without the clock running.
* We then wait a bit for the power to stabilise. Finally,
* enable the bus drivers and clock to the card.
*
* We must _NOT_ enable the clock prior to power stablising.
*
* If a host does all the power sequencing itself, ignore the
* initial MMC_POWER_UP stage.
*/
static
void
mmc_power_up
(
struct
mmc_host
*
host
)
{
...
...
include/asm-arm/elf.h
View file @
28247644
...
...
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3];
#define R_ARM_NONE 0
#define R_ARM_PC24 1
#define R_ARM_ABS32 2
#define R_ARM_CALL 28
#define R_ARM_JUMP24 29
#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
typedef
elf_greg_t
elf_gregset_t
[
ELF_NGREG
];
...
...
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