Skip to content

arm_lpae_init_pte() cpuset_cancel_attach() and other #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m1lua wants to merge 1 commit into
base: r11
Choose a base branch
from
Open

arm_lpae_init_pte() cpuset_cancel_attach() and other #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion drivers/iommu/io-pgtable-arm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,9 +681,12 @@ static int arm_lpae_map_sg(struct io_pgtable_ops *ops, unsigned long iova,
arm_lpae_iopte *ptep = ms.pgtable +
ARM_LPAE_LVL_IDX(iova, MAP_STATE_LVL,
data);
arm_lpae_init_pte(
ret = arm_lpae_init_pte(
data, iova, phys, prot, MAP_STATE_LVL,
ptep, ms.prev_pgtable, false);
if (ret)
goto out_err;

ms.num_pte++;
} else {
ret = __arm_lpae_map(data, iova, phys, pgsize,
Expand Down
18 changes: 10 additions & 8 deletions drivers/mmc/core/mmc_ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,14 +978,16 @@ int mmc_flush_cache(struct mmc_card *card)
{
int err = 0;

if (mmc_cache_enabled(card->host)) {
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_FLUSH_CACHE, 1,
MMC_CACHE_FLUSH_TIMEOUT_MS);
if (err)
pr_err("%s: cache flush error %d\n",
mmc_hostname(card->host), err);
}
if (mmc_card_mmc(card) &&
(card->ext_csd.cache_size > 0) &&
(card->ext_csd.cache_ctrl & 1)) {
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_FLUSH_CACHE, 1,
MMC_CACHE_FLUSH_TIMEOUT_MS);
if (err)
pr_err("%s: cache flush error %d\n",
mmc_hostname(card->host), err);
}

return err;
}
Expand Down
1 change: 1 addition & 0 deletions kernel/cgroup/cpuset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,6 +2184,7 @@ static void cpuset_cancel_attach(struct cgroup_taskset *tset)
struct cpuset *cs;

cgroup_taskset_first(tset, &css);
cs = css_cs(css);

percpu_down_write(&cpuset_rwsem);
cs->attach_in_progress--;
Expand Down
2 changes: 1 addition & 1 deletion net/core/filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4745,7 +4745,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
struct in6_addr *src = (struct in6_addr *) params->ipv6_src;
struct in6_addr *dst = (struct in6_addr *) params->ipv6_dst;
struct fib6_result res = {};
struct neighbour *neigh;
struct neighbour *neigh = NULL;
struct net_device *dev;
struct inet6_dev *idev;
struct flowi6 fl6;
Expand Down
4 changes: 2 additions & 2 deletions techpack/camera/drivers/oplus/cam_sensor_module/cam_ois/onsemi_fw/LC898124/DownloadCmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ unsigned char SelectDownload(UINT8 GyroSelect, UINT8 ActSelect, UINT8 MasterSlav
if( (ActSelect != Dspcode.ActType) || ((GyroSelect&0x7f) != Dspcode.GyroType) ) return(0xF2);

// 高速化対応Download
TRACE("DataPM( %08x ), LengthPM( %08x ) , Parity( %08x ), DataDM( %08x ) , LengthDMA( %08x ) , LengthDMB( %08x ) \n"
, (int)ptr->DataPM , (int)ptr->LengthPM , (int)ptr->Parity , (int)ptr->DataDM , (int)ptr->LengthDMA , (int)ptr->LengthDMB );
//TRACE("DataPM( %08x ), LengthPM( %08x ) , Parity( %08x ), DataDM( %08x ) , LengthDMA( %08x ) , LengthDMB( %08x ) \n"
// , (int)ptr->DataPM , (int)ptr->LengthPM , (int)ptr->Parity , (int)ptr->DataDM , (int)ptr->LengthDMA , (int)ptr->LengthDMB );
return( DownloadToEP3( ptr->DataPM, ptr->LengthPM, ptr->Parity, ptr->DataDM, ptr->LengthDMA , ptr->LengthDMB ) );
}